assign rooms
Merge branch 'origin/Consumer'
assign rooms doGet
Merge branch 'master' into ReceptionManager

Conflicts:
	WebContent/WEB-INF/web.xml
filter using roomlist filter function
Merge branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/web.xml
	src/controller/PaymentController.java