фронтенд закончен
Merge remote-tracking branch 'origin/CMS_JS' into Alex

Conflicts:
	js/cms.js