update composer.json
Add class to compile
Add branch alias master => 2.2.x
Add missing classes to compile
Merge branch '2.1'
Fix composer.json
Merge remote-tracking branch 'refs/remotes/sonata/master'
Merge remote-tracking branch 'refs/remotes/origin/master' into sonata-rmzamora-merge
Merge branch 'refs/heads/sonata-rmzamora-merge' into rmzamora-master