Update composer.lock
Merge branch 'develop' into resource-ref