codestyle
Merge branch 'master' of https://github.com/egor-a-trubnikov/8-exam

Conflicts:
	WebApp/.bem/cache/desktop.blocks/files.json
	WebApp/.bem/cache/desktop.bundles/files.json
	WebApp/.bem/cache/desktop.bundles/index/index.bemhtml.js~bemhtml.meta.js
	WebApp/.bem/cache/desktop.bundles/index/index.css~css.meta.js
	WebApp/.bem/cache/desktop.bundles/index/index.js~browser.js+bemhtml.meta.js
	WebApp/desktop.bundles/index/index.html
	WebApp/desktop.bundles/index/index.js
fix