fixes
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release

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