i18n
Merge branch 'feature/master-class' into select/release

Conflicts:
	conf/locale/ru/LC_MESSAGES/djangojs.po
	conf/locale/ru/LC_MESSAGES/mako.po