Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/layouts/mainLayout.jsp
	src/main/webapp/WEB-INF/pages/tiles/footer.jsp
	src/main/webapp/WEB-INF/pages/tiles/header.jsp
	src/main/webapp/WEB-INF/tiles.xml
messages