m
m
Merge branch 'sergiu'

Conflicts:
	webapps/ROOT/RoomBrowse.jsp