changed in the last merge
Add touch input for mobile devices
Merge branch 'local'

Conflicts:
	Assets/KittyBalloon/Scenes/Test.unity
	ProjectSettings/ProjectSettings.asset