Pulling private rooms changes into development branch.

Adds private rooms code without supporting client-side code.