adjust to phpcr-odm mapping bc break, use phpcr-odm compiler pass
Merge remote-tracking branch 'origin/master' into phpcr-odm-mapping

Conflicts:
	DependencyInjection/Compiler/RoutePass.php
	Resources/config/cmf_routing.xml
Merge pull request #100 from symfony-cmf/phpcr-odm-mapping

adjust to phpcr-odm mapping bc break, use phpcr-odm compiler pass