edit ios-theme license.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	ios-theme/license.txt
edit ios-theme license.txt