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

Conflicts:
	RcmAdmin/public/js/admin/rcm-admin.js
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
add functional tests
add functional tests
Remove issue with angular compile of plugins
Merge remote-tracking branch 'upstream/master'
Merge pull request #213 from jerv13/master

Remove issue with angular compile of plugins
remove error file
Merge remote-tracking branch 'upstream/master' into save
fix brightcove editor player
Merge pull request #214 from rodmcnew/save

fix brightcove player editor
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
fix brightcove editor player
Update dialog