fix links in 3.3 changelog
fix schema
Merge branch 'do_not_push' into 3_3_0_hotfixes
repair nicknames migration so migrate can succeed
Merge pull request #652 from YaleSTC/3_3_0_hotfixes_pre_schema_nickname

3 3 0 hotfixes pre schema nickname
resolve #663
remove unnecessary model methods and replace with scopes
remove equipment model from blackouts
forgot blackouts helper
add blackout controlller
Merge branch 'development' into 654_blackouts
Merge branch 'development' into 654_blackouts
add notice-getting method
remove blackout helper
remove all references to blackout helper
soft blackouts add to cart update
Merge branch 'fix_reverted_validations' into 654_blackouts
add hard blackout message to cart validation
add remove old blackouts task
Merge branch 'development' into 654_blackouts