fix
Merge branch 'touchup' into dev

Conflicts:
	coffee/client/graph.coffee
	js/client/graph.js