Sync codebase with sonata-doctrine-orm-admin-bundle

Remaining, mostly mapping related
Merge pull request #84 from KingCrunch/sync-codebase-3

Sync codebase with sonata-doctrine-orm-admin-bundle