Fix composer.json
Add license, and fix dev dep
Add license file
Merge branch 'master' into develop