Updated the composer.json to allow symfony 2.3
Merge branch '1.1.x'

Conflicts:
	composer.json