Merge branch 'cors' into demo

Conflicts:
	frontend/spec/mws/events.spec.js
	frontend/src/mws/Coll.js
	frontend/src/mws/Shell.js
	frontend/src/mws/events.js
	mongows/demo/templates/events_demo.html
	mongows/demo/views.py
	mongows/mws/util.py
	mongows/mws/views.py
	mongows/validators/ValidationTest.py