phpunit is only required for development
Merge branch 'master' of github.com:crishoj/ZendService_Discogs

Conflicts:
	composer.json