Respecter les conventions de John Papa
Merge  John Papa et carto
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/index.js
	src/index.html