Touch Fixed
Merge branch 'master' of https://github.com/maskedmous/Terra_Lumina

Conflicts:
	Vertical Slice/Assets/Standard
Assets/TouchScript/Editor/TouchScript.Editor.dll.meta
	Vertical Slice/Assets/Standard
Assets/TouchScript/Plugins/OSCsharp.dll.meta
	Vertical Slice/Assets/Standard
Assets/TouchScript/Plugins/TUIOsharp.dll.meta
	Vertical Slice/Assets/Standard
Assets/TouchScript/Plugins/TouchScript.TUIO.dll.meta
	Vertical Slice/Assets/Standard
Assets/TouchScript/Plugins/TouchScript.dll.meta
	Vertical Slice/Assets/Standard
Assets/TouchScript/Plugins/TouchScript.pdb.meta