admin form different
Merge branch 'master' of https://github.com/leoRoss/GTRacketRezRuby

Conflicts:
	app/assets/javascripts/reservations.js.coffee