fixing myrial on myriaweb
fix merge/c backend compiling of myriaweb
Merge branch 'grappa-master' into yorkw-datasets

Conflicts:
	appengine/js/editor.js
	appengine/myria_web_main.py