updated data model for chart
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascript/campaignchart.js
	public/javascript/main.js