[git] ignoring phpdox output
[todo]
Merge branch 'develop'