License to all files
Merge branch 'master' into develop