composer fixes
Merge branch 'master' of https://github.com/Vibius/development-kit