just for pull
Merge branch 'master' of https://github.com/LaurentMasella/Curtius

Conflicts:
	js/src/content/ContentMapView.class.js