added condition so only the type_collection for phpcr admins gets extended
Merge pull request #146 from sjopet/extfix

added condition so only the type_collection for phpcr admins gets extended
ChoiceFieldMask form type
Fixed name, delegated event
Merge branch 'choice_field_mask' of github.com:dantleech/SonataDoctrinePhpcrAdminBundle into choice_field_mask

Conflicts:
	Resources/views/Form/form_admin_fields.html.twig