Revert "Change layoutoptions to layoutobjects"

This reverts commit 7d3ce8056052e02671a469bd6868af767e4afcfd.
Merge branch 'develop'
Missed in merge
Merge branch 'develop'
Merge branch 'master' of github.com:blueriver/MuraCMS
Tweakin app start up logic