Added Features to conference rooms.
Correcting a merge conflict.