Not complite: all
Some critical, major and minor fixes
Merge  branch 'origin/iss_testm1-7'

Conflicts:
	Maker/views.py
	TestMaker/urls.py
	static/js/test_editor.js