Fix issue #25
Fixing issue #29
Fixing issue #27
Fixing issues #24, #30 and #31
Fixing issue #32
Fix issue #33
Merge branch 'development'
Merge branch 'master' of github.com:FlatTurtle/Reservations

Conflicts:
	app/controllers/ReservationController.php