Various entity fixes in regards to route deletion
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Nfq/WeDriveBundle/DataFixtures/ORM/LoadTripData.php