Merge pull request #15 from cocos2d/develop

update lua
update win32 templates
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
Refactor setter of label's font name and font size.
space
space
tab to space
Merge pull request #5772 from chuanweizhang2013/luamerage

Update lua template for win32.
label:rename some API for clearly.
fix some physics bugs.
label:rename some API for clearly.
Merge pull request #5774 from boyu0/physics_bug_fix

fix some physics bugs:
1) Remove unused parameter in PhysicsBody::getMoment.
2) PhysicsShapeBox::getSize return wrong value.
3) Don't draw physics body if it isn't enabled.
Merge pull request #5768 from Dhilan007/develop_label2

Refactor setter of label's font name and font size.
[AUTO]: updating luabinding automatically
Merge pull request #5775 from CocosRobot/update_lua_bindings_1394716568

[AUTO]: updating luabinding automatically
Update CHANGELOG [ci skip]
add build-cfg.json for hellocpp template
update submodule
Merge pull request #5777 from lihex/develop

fix template & update submodule
EditBox:fixed nothing to display when input flag is PASSWORD on Android.