Dashboard Controller
Merge branch 'master' of https://github.com/KevinMarete/stanchart_dashboard

Conflicts:
	.htaccess
	assets/cache/137418763878d2cd41d39b408f2f24f56611bdc558.css
	assets/cache/137430912678d2cd41d39b408f2f24f56611bdc558.css
	assets/cache/137450105678d2cd41d39b408f2f24f56611bdc558.css

merge
newer