Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/tiles-definitions.xml
	src/main/webapp/WEB-INF/views/layout/header.jsp
	src/main/webapp/WEB-INF/views/reportNavigation.jsp