Cocos2d-x 3.0
LWF
Cocos2d-x 3.1rc0
Merge branch 'cocos2d-x'

Conflicts:
	proj.android/jni/Android.mk