Include composer.lock and ignore /vendor
Merge branch 'feature/composer-support' into develop