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