Cocos2d-x 3.0beta
Merge branch 'cocos2d-x-3.0'

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
Sync with LWF