Unkonwn
Merge branch 'master' of https://github.com/yestein/mobile-demo

Conflicts:
	wing/wing/Resources/script/dbg.lua