Merge origin/origin into origin

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	web/roomBooking/payment.xhtml
Merge origin/origin into origin