Datas
Merge branch 'master' of https://github.com/fofoy/Kleam

Conflicts:
	app/Views/dashboard.html