first commit
Merge branch 'master' of https://github.com/LionelMartin/dashboard

Conflicts:
	public/js/dashboard.config.dist.js