Merge sonata
Merge branch 'master' of github.com:dkorsak/symfony-sandbox