some minor changes to user and variables
Merge branch 'master' of https://github.com/EWU-Faculty-Travel-Development/FacultyTravel

Conflicts:
	app/views/partials/editUsers.scala.html