updated license in composer.json
Merge branch 'refs/heads/master' into develop