composer update
Merge branch 'master' of github.com:chugas/symfony-without-vendors-2.1.9

Conflicts:
	composer.json
composer update