UI Sorcery
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/UIElements/Icon.meta