#41 update intention securité & energie
Merge branch 'gh-pages' of https://github.com/SmartCampus/dashboard into gh-pages

Conflicts:
	README.md