Merge pull request #12 from cocos2d/develop

update coco2d-x
merage cocos2d-x lua templateMerge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
add runtime template
Merge pull request #5676 from chuanweizhang2013/luamerage

lua template default