fix SensioGeneratorBundle ~2.3.3 compatibility
Update friendsofsymfony/rest-bundle to version 0.12
Issue #10
Method's parameter change in Sensio Generator bundle.
Issue #10
Method's parameter change in Sensio Generator bundle.
Issue #11
Translate model name when injecting when using extjs_model twig function
Merge branch 'master' of https://github.com/jamesmoey/extjs-bundle

Conflicts:
	composer.json
Merge remote-tracking branch 'upstream/master'