PHPDoc comments
Merge branch 'master/chiba2' of git://github.com/novius-os/core into master/chiba2