Merge pull request #225 from jerv13/master

Fix dialog issue
page permission dialog
Merge remote-tracking branch 'upstream/master' into PagePermissionsControrller
page permission dialog
Merge pull request #226 from innaDa/PagePermissions

Page permissions
Merge remote-tracking branch 'upstream/master'