Hotel-aDditions
status-price
Rooms
Rooms
Merge remote-tracking branch 'remotes/origin/Idlero'

Conflicts:
	war/src/main/webapp/modules/admin/pages/prices.jsp