updating license
Merge branch 'master' into selfsigned_ssl