pas de grand changement sisi
Merge branch 'master' of github.com:SoEnguy/HumanMap

Conflicts:
	trunk/js/map.js