Update per code standards
Updated for code standards
Merge remote-tracking branch 'upstream/master'
Added some temp bits for old user
Merge pull request #11 from jerv13/master

WEBCMS-98 - Documentation and code standards