fixing conflicts
Merge branch 'master' of github.com:EWU-Faculty-Travel-Development/FacultyTravel

Conflicts:
	app/controllers/Application.java
push test