i18n
fixes progress
Merge branch 'select/release' into select/rc

Conflicts:
	lms/djangoapps/instructor/views/legacy.py