Ajax issue fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Category_Modeler/static/js/newScript.js
	Category_Modeler/views.py
fixing the merge issue