resolve PHPDoc errors and typos
Merge pull request #1065 from frankfoerster/3.0-database

resolve PHPDoc errors and typos