allow reservations to be archived by admins
fix typo to assign classes
Merge branch 'master' into 728_reservation_archive
fix broken link
added prompt for mandatory archiving note
prevented strings of spaces from being valid
prevented archiving of checked-in / archived reservations
made archive reservation button only appear to reservations not checked-in
made delete reservation button context-dependent and fixed confirm (see #990)
prevented reservation #archive action for checked-in reservations
allowed for missing archive_note param
added test for invalid renewal
added tests for ReservationsController#archive
updated Gemfile.lock for TravisCI
Merge branch 'master' into 728_reservation_archive (Gemfile.lock conflict)

Conflicts:
	Gemfile.lock
improved handling of archive prompt
Merge branch 'master' into 728_reservation_archive

Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/reservation.rb
Merge branch 'master' into 728_reservation_archive

Conflicts:
	app/assets/javascripts/equipment_objects.js
	app/views/reservations/show.html.erb
check for currently checked out equipment when deactivating
archive reservation if equipment is deactivated