added data for 2 charts
Merge remote-tracking branch 'origin/myriam'

Conflicts:
	app/js/controllers.js
	app/js/services.js