7
Merge branch 'master' into olya

Conflicts:
	src/main/webapp/WEB-INF/jsp/mainLoggedUser.jsp