4.26
Merge remote-tracking branch 'origin/yemeng' into zhouqj

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