343
Merge branch 'master' of https://github.com/ngochivinh/TourProject.git

Conflicts:
	src/main/webapp/WEB-INF/i18n/application.properties
	src/main/webapp/WEB-INF/layouts/layouts.xml