Merge branch 'master' into develop
Changed name and yera in License
Merge branch 'develop'