Update LICENSE
Merge branch 'dev'