Merge branch 'master' of https://github.com/evg299/spring_dojo

Conflicts:
	src/main/webapp/resources/js/app/widget/menu/TopMenu.js
Merge remote-tracking branch 'origin/master'