updated composer.json with some extra fields
Merge remote-tracking branch 'origin/master'