Revert 2.0.*@dev change to work with the correct dependency defined in composer.json
Fix template
Merge remote-tracking branch 'refs/remotes/sonata/master'
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master