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
Removed trailing whitespace
Quick bug-fix on previous commit: fixed call to User.import_with_ldap
Simplified User#assign_type; addresses #373
Created before_filter to set equipment model
Deleted redundant variable assignment
Merge branch '363_CatalogController_refactoring'
fixed merge conflicts