Update LICENSE

Changed licensing terms.
Fixing merge conflicts.
Merge branch 'license'