Merge pull request #8 from jerv13/master

WEBCMS-95 - Add User.state
Merge pull request #9 from jerv13/master

WEBCMS-24 - ACL update and Docs
Merge remote-tracking branch 'upstream/master'