Updated the composer constraint to allow Symfony 2.3
Merge branch '1.3.x'

Conflicts:
	composer.json