#737 Options: modified loading of options when changing layout in page properties / new page form
Merge branch 'dev-contents-drag-and-drop' of github.com:devbridge/BetterCMS into dev-contents-drag-and-drop
#737 Created a test for Options Service method GetMergedMasterPagesOptionValues
Merge branch 'dev-contents-drag-and-drop' of github.com:devbridge/BetterCMS into dev-contents-drag-and-drop