switched to composer install instead of update
Merge branch 'develop'