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

Conflicts:
	.gitignore
	ExperienceService/.classpath
	ExperienceService/src/ccnt/experience/service/DeviceInfoService.java
	ExperienceService/src/ccnt/experience/service/TouchDataService.java
	TouchLogger/src/zju/ccnt/xptools/view/MyWindowManager.java
fix conflict