merging changes from console
added the ability to set chart type via settings object, tweaks to tree map
Merge branch 'refs/heads/upstream-master'

Conflicts:
	aw.d3Charts.js