Merge branch 'hotfix/new-resource'
psr4 layout
avoid psr-0 error detection for psr-4
fix extra empty line
fix docblocs
use explicit php-cs-fixer rules for psr4
Merge branch 'feature/psr4'