Refactoring
Merge branch 'DB'

Conflicts:
	src/CCPStatic/MapBundle/Entity/Landmark.php