updated composer.json
Merge remote-tracking branch 'bitbucket/1.0-develop' into 1.0-develop