Merge branch 'development'
Added license type im composer.json
Merge branch 'master' into development