Add chart.js in dashboard
add chart.js
Merge branch 'master' into node

Conflicts:
	app/logs/dev.log
	app/logs/prod.log
	src/.DS_Store
	src/CMS/.DS_Store
	src/CMS/AdminBundle/Resources/public/.DS_Store
	src/CMS/AdminBundle/Resources/public/js/.DS_Store
	src/CMS/AdminBundle/Resources/public/js/.DS_Store~Change UI of Admin
	src/CMS/DashboardBundle/Resources/.DS_Store
	src/CMS/DashboardBundle/Resources/public/.DS_Store
	src/CMS/DashboardBundle/Resources/views/Default/index.html.twig
	src/CMS/FrontBundle/.DS_Store
	src/CMS/FrontBundle/Resources/.DS_Store
	src/CMS/FrontBundle/Resources/public/.DS_Store
	src/CMS/FrontBundle/Resources/public/V2/.DS_Store
	web/css/main-flat.css