Breaking method apart #1315
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop