Fixed for composer?
Merge branch 'master' of github.com:trollboy/translate

Conflicts:
	composer.json
cleanup