better test for show/hiding "Begin Now" links
Merge branch 'master' into upgrades

Conflicts:
	spec/controllers/reservations_controller_spec.rb