tmp
本地zjw分支reset到最新
Merge branch 'zjw' into zhouqj

Conflicts:
	TouchLogger/project.properties
	TouchLogger/src/zju/ccnt/xptools/TouchDataApplication.java
	TouchLogger/src/zju/ccnt/xptools/util/ConfData.java
5.7 上传deviceinfo