Merge branch 'feature/encrypt_lua_scripts' of https://github.com/SunLightJuly/quick-cocos2d-x into test2

Conflicts:
	lib/cocos2d-x/cocos2dx/Android.mk
	lib/cocos2d-x/scripting/lua/cocos2dx_support/CCLuaStack.cpp
	lib/cocos2d-x/scripting/lua/cocos2dx_support/CCLuaStack.h
	lib/cocos2d-x/scripting/lua/proj.android/Android.mk
	lib/proj.android/Android.mk
	lib/proj.ios/quickcocos2dx.xcodeproj/project.pbxproj
	lib/proj.mac/quickcocos2dx.xcodeproj/project.pbxproj
	player/proj.mac/quick-x-player.xcodeproj/project.pbxproj
	player/sources/AppDelegate.cpp