integration with latest room booking form
Merge branch 'master' of github.com:uqlibrary/uqlibrary-booking

Conflicts:
	uqlibrary-booking.html