PHPDoc
Merge branch 'develop' of github.com:Eresus/Articles into develop