Merge pull request #1042 from stevewithington/develop

6.1 display object edits
Fixing logic issue
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop