Fixed licence syntax
Rename phpunit.dist.xml to phpunit.xml.dist
Merge branch 'master' into refactoring_interfaces