translate
translate
translate
translate
change encode
Merge branch 'v3' of https://github.com/Carl01Zhang/cocos2d-x into v3

Conflicts:
	cocos/base/CCTouch.h
Merge pull request #154 from u0u0/v3

merge