ref-1
ref 2
Complete: iss_testm1-9
remove unneeded applications 'Maker'
User v1 complete
Merge branch 'iss_testm1-9'

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