Merge branch 'danyaglebtestbranch' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/navigation.jsp
	src/main/webapp/WEB-INF/jsp/projects.jsp
	src/main/webapp/index.jsp