Managing Hide/Show Menus
Listing Rooms
Listing Rooms
Merge origin/master

Conflicts:
	app.js