Update symfony and sensio/generator-bundle dependancy version
Merge branch 'master' into test2.4
Merge remote-tracking branch 'origin/master' into test2.4

Conflicts:
	composer.json
Fix typo in composer.json
Modified dependency to symfony 2.4
Modified dependency to symfony 2.4
Modified dependency to symfony 2.4
Modified dependency to symfony 2.4
Modified dependency to symfony 2.4
Doctrine PHPCR porting
Added the Route requirement for the id field + Fixed the type conversion in the Generator Service
Added the persist param for the Field Anotation
Merge branch 'test2.4' of https://github.com/s4brown/extjs-bundle into test

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/asiragusa/extjs-bundle into test

Conflicts:
	composer.json