Merge remote-tracking branch 'refs/remotes/sonata/master'
fixed composer
Merge pull request #208 from sstok/patch-1

fixed composer
Add 2.2 alias
Fix dependencies
Merge remote-tracking branch 'refs/remotes/sonata/master'

Conflicts:
	composer.json
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master

Conflicts:
	composer.json
Merge remote-tracking branch 'refs/remotes/origin/rmzamora-master' into 2.1

Conflicts:
	composer.json