graphs better
Merge branch 'master' of github.com:xriss/iati-js

Conflicts:
	ctrack/js/view_test.js