2
Merge branch 'master' of https://github.com/Weberd/narod2

Conflicts:
	www/Symfony/src/Acme/MapBundle/Resources/views/Map/result.html.twig