update to handle datasets
Merge branch 'master' into develop

Conflicts:
	angular-chart.js