Merge branch 'yemeng' into zhouqj

Conflicts:
	TouchLogger/src/zju/ccnt/xptools/view/MyWindowManager.java