Merge branch 'master' into local_dev
Modify all the Licence File.
Merge branch 'local_dev'