User control
Back end of user updating
Features for inactivating users
Finished the basic user control
Merge branch 'user'
Merge branch 'master' of github.com:dsfugimoto/lims

Conflicts:
	app/models/User.php
	app/routes.php