Merge "Add docs to Conference object." into lmp-dev