Refactored to allow property changes; Added permissions per field
Cleaned json files of conditional tests
Fixed merge conflicts;
Merge branch 'shoptology-page-role-conditionals' into config-manager