vendor ignored, and composer update
Merge branch 'develop'
composer update