Added restrictions to the form.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/reservation/reservation.html
Merge fix