Merge branch 'v1.3.1_anim' into v1.3.1

Conflicts:
	lib/libextends/libluaexport/src/luaexport/FsLibBox2d.cc
	lib/libextends/libluaexport/src/luaexport/FsLibFaerisExport.cc
	lib/libextends/libluaexport/src/luaexport/FsLibFaerisExtExport.cc
	lib/libextends/libluaexport/src/luaexport/FsLibLuaScript.cc
	lib/libextends/libluaexport/src/luaexport/FsLibSpineSprite.cc
@fix multouch bug
Merge branch 'v1.3.1_anim' into v3.0

Conflicts:
	lib/libextends/libluaexport/src/luaexport/FsLibBox2d.cc
	lib/libextends/libluaexport/src/luaexport/FsLibFaerisExport.cc
	lib/libextends/libluaexport/src/luaexport/FsLibFaerisExtExport.cc
	lib/libextends/libluaexport/src/luaexport/FsLibLuaScript.cc
	lib/libextends/libluaexport/src/luaexport/FsLibSpineSprite.cc
@fixbug b2DebugDraw
@fixbug Particle2DEffect
@fixbug particle
@fixbuf Particle2DEffect can't rotation
Merge branch 'v3.0'

Conflicts:
	lib/libextends/libluaexport/src/luaexport/FsLibBox2d.cc
	lib/libextends/libluaexport/src/luaexport/FsLibFaerisExport.cc
	lib/libextends/libluaexport/src/luaexport/FsLibFaerisExtExport.cc
	lib/libextends/libluaexport/src/luaexport/FsLibLuaScript.cc
	lib/libextends/libluaexport/src/luaexport/FsLibSpineSprite.cc