added in models and their controllers
Merge branch 'master' of
https://github.com/EWU-Faculty-Travel-Development/FacultyTravel

Conflicts:
	conf/evolutions/default/1.sql
.