Merge branch 'gitmaster'
fix the problem when building debug version
Merge branch 'master' of server:NodeLua
Merge branch 'master' into gitmaster