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
add a fill parameter to ccDrawCircle method, and CCCircleShape now can draw a circle with fill.
set a default value of paramerer fill to false.
modify bug of pack_files.sh
modify display.newCircle and display.newRect to support more parameters;
add display.newSolidCircle to draw a circle by CCDrawNode.
compile framework
merge develop
improve display.newRect/newCircle
improve display.newRect/newCircle
compile framework