Updating licensing
Merge branch 'master' into feature/view-revamp