add axis WIP
Merge branch 'adnan' into dev

Conflicts:
	js/client/graph.js