Merge branch 'master' into develop

* master:
  Slight views fix
  Drumlore updates
Extracting Kipple
Updated licensing
Merge branch 'develop'

* develop:
  Updated licensing
  Extracting Kipple