updated composer for packagist
changed dependency temporarily until PR is merged.
updated default branch
fixed composer error
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-sonata-merge

Conflicts:
	composer.json
Merge branch 'refs/heads/rmzamora-sonata-merge' into rmzamora-master
Fix regression (recursive loop)
Fix regression x2 (recursive loop)
Fixed condition
Merge pull request #172 from sylvaindeloux/patch-1

Fixed condition
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master
Merge remote-tracking branch 'refs/remotes/origin/rmzamora-master' into 2.1
fix to add getRouteDebugMessage a required method from VersatileGeneratorInterface
Merge remote-tracking branch 'refs/remotes/origin/CmsPageRouter-fix' into 2.1
Merge remote-tracking branch 'refs/remotes/origin/2.1' into rmzamora-master
Merge remote-tracking branch 'refs/remotes/origin/rmzamora-master'