Updated the composer.json to allow symfony 2.3
Merge remote-tracking branch 'refs/remotes/KnpMenuBundle-GITHUB/1.1.x' into 1.1.x

Conflicts:
	composer.json