#737 Options: changed logics of loading page options when page has a master page
Merge branch 'dev-contents-drag-and-drop' of github.com:devbridge/BetterCMS into dev-contents-drag-and-drop