about suite et petits arrangements sur les templates
Merge branch 'master' of https://github.com/fhacktory/46cl

Conflicts:
	site/index.html
	site/js/action.js