ROOMS-203: On the enquiry style checkout form is broken
ROOMS-203: (Followup) Clean forms
Merge branch 'master' into rooms-203

Conflicts:
	modules/rooms_booking_manager/rooms_booking_manager.module
Merge pull request #51 from plopesc/rooms-203

ROOMS-203: On the enquiry style checkout form is broken