Локальный
Merge branch 'master' of https://github.com/ikharlampenkov/bungur

Conflicts:
	src/main/webapp/js/main.js