License added
Merge remote-tracking branch 'origin/master'
License data fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py