Merge pull request #433 from YaleSTC/development

Merge Summer Changes into Master
Merge branch 'master' of github.com:YaleSTC/reservations
fix for can't create new users
fixed bug with activate/deactivate buttons
Merge branch 'development' of github.com:YaleSTC/reservations into development
simple unprotected status controller
re-ordered migration to fix a bug