pagetemplates

Conflicts:
	Form/HeaderPagePartAdminType.php
pagetemplates
code cleanup
coding style remarks Wim
Merge branch 'master' into pagetemplates

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

Conflicts:
	EventListener/NodeListener.php
	Resources/config/services.yml
Merge pull request #69 from Kunstmaan/pagetemplates

Pagetemplates
fix missing request
Fix after merge: missing request
Merge branch 'master' of git://github.com/Kunstmaan/KunstmaanPagePartBundle

* 'master' of git://github.com/Kunstmaan/KunstmaanPagePartBundle:
  Fix after merge: missing request
put content tab first
fix pagepart admin layout for smaller screens
Merge pull request #73 from Kunstmaan/fix/pagepartsadmin_small_area

fix pagepart admin layout for smaller screens
fix pagepart editor when adding a pagepart
pageparts were cloned twice on deepclone when there are multiple ppconfigurations for the same context
Merge pull request #75 from Kunstmaan/fix_clone_doublepageparts

pageparts were cloned multiple times on deepclone when there are multiple ...
Merge pull request #76 from Kunstmaan/fix_ckeditor_pageparts

fix ckeditor when adding a pagepart
Update README.md
Update widget.html.twig

Fixed mistype
Merge pull request #78 from darles/master

Mistype
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