Updated licensing
Merge branch 'develop'