updated composer.lock
Merge branch '1.0-develop' into 1.0