merge quick
merge quick CocosDenshion
merge quick
Merge branch 'feature/merge_quick'

Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/base_nodes/CCNode.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/platform/android/jni/JniHelper.cpp
	cocos2dx/platform/win32/CCImage.cpp
	extensions/Android.mk
	extensions/cocos-ext.h
	scripting/lua/cocos2dx_support/CCLuaStack.cpp
	scripting/lua/cocos2dx_support/tolua_fix.c