Update LICENSE
Merge branch 'devel'