Fixed composer json
Made package symfony 2.3 compatible
Merge branch 'master' into 1.0

Conflicts:
	composer.json
Fixed composer json