page permission dialog completed including page type and highlighting assigned roles
page permission dialog completed including page type and highlighting assigned roles
Merge remote-tracking branch 'upstream/master' into PagePermissionsControrller

Conflicts:
	RcmAdmin/src/RcmAdmin/Controller/PageViewPermissionsController.php
page permission dialog
Merge remote-tracking branch 'upstream/master' into PagePermissionsControrller

Conflicts:
	RcmAdmin/config/module.config.php
Merge pull request #215 from innaDa/PagePermissionsControrller

Page permissions controrller