Merge branch 'development' into 317_overdue_checkin_emails
fixed whitespace in admin_mailer.rb
removed unrelated CSS
removed commented-out CSS code
updated CSS comment
updating gemfile.lock
Merge branch '528_short_term_cart_fix' of github.com:YaleSTC/reservations into 528_short_term_cart_fix
Merge pull request #528 from YaleSTC/528_short_term_cart_fix

Short-term cart fix being merged in!
added persistent flash for admins in non-admin views
replaced schema file
change items per page form to put
#533 test
#447 copied announcement views and controller from branch announcements_ui
#477 changed date fields to use jquery datepicker
#447 form update.
#447 #421 to do: restrict announcement end date
#447 #421 removed .titleize
Installed Paper_Trail gem and applied it to the Reservation model. (A lot of tests broken, not clear why.)
edited date format to match cart and linked to already existing js to control dates
47 removed some unnecessary code