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

Conflicts:
	composer.json
Add translations
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
tagging
Merge branch '2.2' of git://github.com/Kunstmaan/KunstmaanPagePartBundle into 2.2
Merge branch 'master' into 2.2

* master:
  remove assert annotations
  remove assert annotations
  $event
  typo fix
  remove request scope from nodelistener service
  Start of going to Symfony 2.2

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

* master:
  Update widget.html.twig
  Update README.md
  pageparts were cloned twice on deepclone when there are multiple ppconfigurations for the same context
  fix pagepart editor when adding a pagepart
  fix pagepart admin layout for smaller screens
  put content tab first
  Fix after merge: missing request
  fix missing request
  coding style remarks Wim
  code cleanup
  pagetemplates
  pagetemplates

Conflicts:
	Form/HeaderPagePartAdminType.php
Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency
use self.version for Kunstmaan Bundles
Merge branch 'master' into symfony-2.3

* master:
  use self.version for Kunstmaan Bundles
  Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency
  tagging
  Add translations
  Update composer.json
  Update composer.json

Conflicts:
	composer.json