backup..
not in good mood...

Signed-off-by: adobeattheworld <jerry.l.du@hotmail.com>
Merge branch 'master' of https://github.com/AdoBeatTheWorld/waytomobile

Conflicts:
	projects/game003/scripts/app/controllers/PlayerController.lua