Merge remote-tracking branch 'origin/master'

Conflicts:
	mepa-front/src/main/webapp/WEB-INF/views/tiles/header.jsp