Merge branch 'release/1.0.0'
Fix the docblocks
Make sure front-end controller is loggable too
Merge branch 'master' into develop