Merge branch 'page_fix'

Done with this feature branch
Merge remote-tracking branch 'upstream/master'

Updating local repo to latest version
fixed permissions/edit
Merge pull request #7 from dperny/master

Fixed bug where permissions could not be edited.