Update License.txt
Merge branch 'master' into branch1

Conflicts:
	License.txt