ReservationsController#new dies when user/account have no price groups
ReservationsController#create does not allow purchase for users with no price groups
Merge branch 'master' into upgrades
Auto-canceller cancels past reservations sitting in cart #71349
Merge pull request #37 from tablexi/auto_cancel_cart_71349

Auto-canceller cancels past reservations sitting in cart #71349
Making 'Begin Now' link of reservations work with ajax #69841
rspec test for 'Begin Now' changes #69841
Removing overlooked unnecessary test #69841
remove pry-debugger
remove extraneous comment
fix failing spec on oracle
Merge branch 'master' into upgrades

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
fix authorization for accessory adding
pick_accessories view has be obviated
fix uploadify widget #71705
Merge branch 'upgrades' into accessory_scaling

Conflicts:
	app/views/shared/_reservations_table.html.haml
	config/routes.rb