Merge branch 'tmp' into master-v2

Conflicts:
	cocos2d-ios.xcodeproj/project.pbxproj (reverse-merged from commit 566d8c99434ff7831cbda6d1e10186d82788ac5e)