Updated composer.json for packagist
Merge branch 'master' of github.com:manialib/symfony-rest-edition

Conflicts:
	composer.json