Merge pull request #10 from jerv13/master

WEBCMS-24 - Update and Docs
Merge remote-tracking branch 'upstream/master'
Added some temp bits for old user