Merge pull request #13 from jerv13/master

WEBCMS-115 - Main refactor complete
Merge remote-tracking branch 'upstream/master'