Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/reportNavigation.jsp
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/reportNavigation.jsp