Add icons for ui controls
Merge remote-tracking branch 'origin/UIEditor' into UIEditor

Conflicts:
	Tools/UIEditor/UIEditor.xcodeproj/project.pbxproj