Merge branch 'master' into front
Регистрация
фикс стилей реги
Merge remote-tracking branch 'remotes/origin/front'

Conflicts:
	module/Zachetka/view/layout/layoutInner.phtml