merge
changed chmod on phpunit