Update composer.json
add class to compile
Add branch alias
Update dependencies
Update dependencies
Fix typo
Merge remote-tracking branch 'refs/remotes/sonata/master'

Conflicts:
	composer.json