update composer.json
ignore composer.lock
updated composer.json
Merge branch 'dev-0.2'