Template(not finished)
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel-agency-application/src/main/webapp/WEB-INF/jsp/index.jsp