License update

Conflicts:
	LICENSE