i18n
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/webapp/WEB-INF/views/loginView.jsp
	WebApp/src/main/webapp/WEB-INF/views/users/createTripView.jsp
	WebApp/src/main/webapp/WEB-INF/views/users/profileHeaderView.jsp
i18n repush...... ><