Merge pull request #1 from chukong/master

update
fixed bug in CCLuaStack::executeScriptFile()
Merge pull request #411 from SunLightJuly/bug_fix

fixed bug in CCLuaStack::executeScriptFile()
Merge pull request #410 from htlxyz/master

Master
fix win32 compile errors
修复CCArmature 点击事件响应区域不正确bug
Merge pull request #412 from bigHandYT/master

 修复CCArmature 点击事件响应区域不正确bug
fix win32 release compile errors
Merge branch 'master' of https://github.com/chukong/quick-cocos2d-x

Conflicts:
	lib/cocos2d-x/external/extra/platform/win32/CCNativeWin32.cpp
modify ccsloader