phpunit.xml.dist added
Merge remote-tracking branch 'origin/master' into issue_7