Embed Ace editor for in-place dashboard editing
Merge branch 'master' of https://github.com/graphite-project/graphite-web
Merge remote-tracking branch 'remotes/jordan-jsoneditor/master' into develop

Conflicts:
	webapp/graphite/templates/dashboard.html
- remove cacti Zoom