cdn
Merge branch 'staging' of github.com:mindmup/mindmup into staging

Conflicts:
	compiled_ts.rb
	public/mapjs-compiled.js