#964 Fixed wrong inheritance of master pages security
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev