Jashon Wan
Merge branch 'master' of https://github.com/kevinluosl/montage-jschart

Conflicts:
	.idea/workspace.xml
	ui/bar-chart.reel/bar-chart.js
	ui/chartjs.reel/chartjs.js