@commit for merge
Merge branch 'v1.2' of 192.168.1.10:faeris into v1.2

Conflicts:
	application/FaerisLua/proj.android/bin/jarlist.cache
	platform/proj.android/faeris/bin/libfaeris.jar
@commit for conflict
Merge branch 'v1.2' of 192.168.1.10:faeris into v1.2

Conflicts:
	application/FaerisLua/src/platform/FsWin32Main.cc
@commit for merge
Merge branch 'v1.2' of 192.168.1.10:faeris into v1.2

Conflicts:
	application/FaerisLua/bin/main.lua
	src/scheduler/FsScheduler.cc
Merge branch 'v1.2' of 192.168.1.10:faeris into v1.2

Conflicts:
	application/FaerisLua/proj.android/gen/org/faeris/lib/R.java
@ fix android gl context lose when activity not focus
Merge branch 'master' into v1.2

Conflicts:
	application/FaerisLua/bin/linux.fgame
	application/FaerisLua/src/platform/FsWin32Main.cc
	src/util/FsPathUtil.cc