FIX map
Merge branch 'master' of https://github.com/azertea/nuitdelinfo2014

Conflicts:
	site/assets/html/imhere.html
Merge branch 'master' of https://github.com/azertea/nuitdelinfo2014