Enrolled Students fix
image input fix

Conflicts:

	common/lib/xmodule/xmodule/js/src/capa/imageinput.js
Пользовательское соглашение по-русски

Conflicts:

	lms/templates/static_templates/tos.html
Пользовательское соглашение по-русски

Conflicts:

	lms/templates/static_templates/tos.html
Пользовательское соглашение по-русски (фикс) + полное имя по-русски
Пользовательское соглашение по-русски (фикс)
Пользовательское соглашение в футере
Problem fix + green Answer
robots.txt - disallow all
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes

Conflicts:
	lms/templates/static_templates/tos.html
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes
Merge branch 'merged_with_master_fixes' of https://github.com/pelikanchik/edx-platform into merged_with_master_fixes