1.增加addBoxShape对offset的支持
2.修改tolua文件并生成对应的c++文件，使编译后的库能够在player中使用
Merge pull request #402 from dongxurr123/develop

增加chipmunk中addBoxShape对offset的支持
Fix ByteaArray issues
Add DragonBonesCPP support.
Rename samples/dragonbones to samples/ccarmature;
Add samples/dragonbones for DragonBoonesCPP.
Update win32 project to support DragonBonesCPP
Add DragonBonesCPP support for proj.ios
Update Android compile options
fix init.lua
fix a typo
Add bytearray sample
Merge pull request #408 from zrong/develop

Add DragonBonesCPP support.
Add setColor and setOpacity to CCDragonBones
Merge branch 'develop' of github.com:chukong/quick-cocos2d-x into develop
Merge pull request #409 from zrong/develop

Add setColor and setOpacity to CCDragonBones
rename cc.Sprite.getColor() to cc.Sprite.getColorAtPoint(), avoid override CCSprite::getColor()
Merge branch 'develop'

Conflicts:
	lib/cocos2d-x/scripting/lua/cocos2dx_support/LuaCocos2d.cpp
	lib/framework_precompiled/framework_precompiled.zip
	player/mac/player.app/Contents/MacOS/player
	player/proj.mac/player.xcodeproj/project.pbxproj
	samples/chukong_ad/res/framework_precompiled.zip
	samples/cocopush/res/framework_precompiled.zip
	samples/iap4ios/res/framework_precompiled.zip
	samples/luajavabridge/res/framework_precompiled.zip
	samples/touch/res/framework_precompiled.zip
	samples/umeng_analytics/res/framework_precompiled.zip
	samples/umeng_feedback/res/framework_precompiled.zip
	samples/umeng_push/res/framework_precompiled.zip
	samples/umeng_share/res/framework_precompiled.zip
	samples/umeng_update/res/framework_precompiled.zip
	template/PROJECT_TEMPLATE_01/res/framework_precompiled.zip
update framework zip
update luabinding
update player mac