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
同步最新develop版本
Test quick-x-server Success
ignore some files
Merge develop-RC;
Websocket: test new Action
同步官方最新版本
同步
完全同步官方develop版本(2014年1月5日 0:32:29)
支持资源加密
修改了IOS及MAC的工程文件
support encrypted pvr.ccz
modify bug of pack_files.sh
merged dualface/develop
Merge branch 'develop_df' into develop

Conflicts:
	bin/setup.sh
	framework/cc/net/SocketTCP.lua
	framework/cc/net/init.lua
	framework/cc/utils/ByteArray.lua
	framework/cc/utils/ByteArrayVarint.lua
	framework/cc/utils/Gettext.lua
	framework/cc/utils/init.lua
	lib/cocos2d-x/cocos2dx/platform/android/java/src/org/cocos2dx/utils/PSDialog.java
	lib/cocos2d-x/cocos2dx/platform/android/java/src/org/cocos2dx/utils/PSJNIHelper.java
	lib/cocos2d-x/cocos2dx/platform/android/java/src/org/cocos2dx/utils/PSNative.java
	lib/cocos2d-x/cocos2dx/platform/android/java/src/org/cocos2dx/utils/PSNetwork.java
	lib/cocos2d-x/cocos2dx/platform/mac/CCImage.mm
	lib/cocos2d-x/scripting/lua/cocos2dx_support/CCLuaStack.cpp
	lib/cocos2d-x/scripting/lua/cocos2dx_support/CCLuaStack.h
	lib/proj.ios/quickcocos2dx.xcodeproj/project.pbxproj
	lib/proj.win32/cocos2dx_2012.vcxproj
	lib/proj.win32/cocos2dx_2012.vcxproj.filters
	player/sources/AppDelegate.cpp
	quick-x-setup.app/Contents/MacOS/quick-x-setup
	quick-x-setup.app/Contents/Resources/script
读文件内容时增加对长度的判断，避免ios上0字节文件造成出错
Merge pull request #263 from SunLightJuly/encrypt_resource

Encrypt resource
Merge pull request #1 from dualface/develop

合并原版本
Merge branch 'develop' into feature/add_ui&display_function

Conflicts:
	lib/proj.mac/quickcocos2dx.xcodeproj/project.pbxproj