added a license
Merge branch 'master' into upload-disabled