Docblocks
Merge branch 'master' of github.com:modulargaming/user