fix bugs of room layout
Merge branch 'master' of https://github.com/drizztz/Axalent

Conflicts:
	Axalent.xcodeproj/project.pbxproj
update room view.