Mulit Touch
Merge branch 'master' of https://github.com/yestein/HelloWorld

Conflicts:
	Resources/script/scene/scene_base.lua