merging in changes from https://github.com/YooApplications/TouchKit
Merge branch 'master' of https://github.com/YooApplications/TouchKit

Conflicts:
	Assets/Plugins/TouchKit/Helpers/TouchKitEditorSupport.cs
Merge branch 'master' of https://github.com/YooApplications/TouchKit

Conflicts:
	Assets/Plugins/TouchKit/Helpers/TKTouch.cs
	Assets/TouchKit/Helpers/TouchKitEditorSupport.cs