Merge pull request #15 from dayax/develop

merge to develop
fix phpunit configuration
fix collections autoload