small changes
Merge branch 'master' of https://github.com/koalejo/dax-dev-tools-suite

Conflicts:
	apps/chartdemo/js/renderer.js