stuff for email functionality...
forgot to add the mail jar
Merge branch 'master' of https://github.com/EWU-Faculty-Travel-Development/FacultyTravel.git
Worked on perspnal trips functionality
neil's changes
update personal trip works within general trip
fixes for print trip  still hanging up on departure/destination/and the
depart/return times
more fixes on Form
fixes for Form.java
fixed home page
Merge branch 'master' of https://github.com/EWU-Faculty-Travel-Development/FacultyTravel.git
role testing example
new routes for emailing
email working on submit in trips and when a new user is created
edited yml file to add a new trip 3 which is currently hardcoded in the
trips controller to send that id when new trip is added also changed my
role to 2 (DTC) for recieving submit emails did not want margo/connie
getting them yet, if you dont rerun the db script it will error when you
click submit on new trip.. this will work correctly when the submit
button is fully functional
Got rid of Username at top of Add user table
Merge branch 'master' of https://github.com/EWU-Faculty-Travel-Development/FacultyTravel.git
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
hotfixed the userscontroller being unable to update