change license to correct identifier, add license file
Merge branch 'master' into develop

Conflicts:
	LICENSE.txt