updating composer to work with buzz dep
Merge branch 'develop'