Created module for setting user in application setup and users controller
Cleaned up app setup controller after previous commit
refactored set_view_mode in application_controller
deleted dead code from activate and deactivate methods in application_controller
moved admin validation from activate/deactivate methods to a before_filter method
created ReservationsBase module
Re-factored file deletion to an extra method, added versatility wrt asset types
Refactored @equipment_model selection by id into separate method called as before_filter for relevant RESTful actions
Fixed #368 in seeds.rb
fixes category name validation error
formatting fixes in gemfile
updated refactoring for new_users, #355
Merge pull request #371 from YaleSTC/355_356_357_refactoring

355 356 357 refactoring
improved naming of before_filter method, added todo comment
Merge pull request #370 from YaleSTC/365_equipment_models_controller_refactoring

#365 & #368: Refactor EquipmentModelsController, fix file location
Merge pull request #369 from YaleSTC/360_black_outs_controller_refactoring

#360 #362 black outs controller refactoring
Merge pull request #361 from YaleSTC/359_create_reservations_base_module

created ReservationsBase module
Created set_user before_filter, refactored import and fixed bug with bad CSV files
Refactored import functions into new controller, changed the associated routes and views
Moved import methods from UserModel to ImportUsersController; removed validation of phone number length