Re-add page permisions
Merge remote-tracking branch 'upstream/master'
Product pop-up
Merge pull request #224 from jerv13/master

Re-add page permisions