rm composer.phar
Merge branch 'sonata/master'