footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/webapp/WEB-INF/views/users/createTripView.jsp
Merge remote-tracking branch 'origin/master'