feature #1802:add touches lua test
Merge branch 'master' into feature_1802

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
Merge pull request #2111 from yuezang/feature_1802

feature #1802:add touches lua test