Feature/architecture refactor#25

ljonesfl wants to merge 2 commits intodevelopNeuron-PHP/cms:developfrom

feature/architecture-refactorNeuron-PHP/cms:feature/architecture-refactorCopy head branch name to clipboard