fix screen touch
Merge branch 'master' of https://github.com/proudaut/GGJ

Conflicts:
	Assets/Resources/GoblinNoControle.prefab
	Assets/Resources/Troll.prefab
	Assets/Resources/TrollNoControle.prefab
	GGJ.userprefs
Merge branch 'master' of https://github.com/proudaut/GGJ