Intégration carto
Merge branch 'master' of https://github.com/vjo/PhotoDrop

Conflicts:
	_/js/functions.js
	index.html
maj js