...
Fix issue #1998
Move max_enrollment_instr_buttons to course settings
Fix issue #2012
Merge remote-tracking branch 'origin/select/devel' into select/release

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