Extracted private methods from import users controller to a lib module and added comments. Changed user model to only skip phone validation when importing from csv.
Added admin option to require phone numbers or not. Fixed views to accommodate blank phone numbers and not display the * when validations are disabled
Hacked together a fully functional but not DRY solution to #161
DRYed out the implimentation of the autocomplete method by moving it to a module
Added comments to users controller
#170 Added permissions booleans on app config for allowing checkout persons to be treated as admins when creating a reservation or checking out
320 changed reserving-for field to start blank for admins and checkout persons
Fixed scrolling bug for new user modal box in catalog
Merge pull request #422 from YaleSTC/212_phone_validations_and_user_import

Extracted private methods from import users controller to a lib module a...
merge conflict
Added soft-delete to checkin and checkout procedures so that they revive when equip model is reactivated
resolves 426, refactored activate and deactivate btn creation to helper, added confirmation on deactivate to notify user that reservations will be permenantly deleted
Merge pull request #431 from YaleSTC/427_27_deactivate_bugs

Resolved 426 and 427 issues with the deactivation function throughout app
Merge pull request #432 from YaleSTC/320_reserving_for_field

320 reserving for field
fixed setup bug introduced by phone number validation
cleaned up autocomplete module and added comments to reservations controller
Merge pull request #430 from YaleSTC/161_find_user_box

Improve auto-complete code
fixed merge conflicts
Merge pull request #433 from YaleSTC/development

Merge Summer Changes into Master
removed extraneous migration