Update composer.json
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2

* master:
  fix assests generation
parse namespace
fix template
Default site fixtures tweaks
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2

* master:
  fix CSS parsing
composer fix
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2

* master:
  default action no longer needed, it even breaks the site
Merge branch 'master' into 2.2

* master:
  Homepage behat test in default site generation
  fix namespace
  Generate a FeatureContext which extends the FeatureContext of the KunstmaanBehatBundle
  move page classes to Pages folders continuation
  Move page classes to Pages folder
  command description update
  generate AdminList option in generate Entity command
  Kunstmaan Entity Generator
  Generate error templates
  Update README.md
Merge branch 'master' into 2.2

* master:
  move unit test to default site generation
Merge branch 'master' into 2.2

* master:
  generate tests to test the backend after generating the default site
  entity name fix in comment
Merge branch 'master' into 2.2

* master:
  SensioGenerator 2.2 dependency
  test user creation, edit and disable
  Fix symfony requirement
  Start of going to Symfony 2.2
  improved login test, user creation test

Conflicts:
	composer.json
Merge branch 'master' into 2.2

* master:
  Update README.md
  code cleanup
  pagetemplates
  moved dependeccies that are not related to the GeneratorBundle to suggested packages. They're dependencies of the generated classes
  php-cs-fixer fix
  added missing form pageparts

Conflicts:
	composer.json
Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency
Symfony 2.2 dependency