4.29 DeviceInfoUtil
4.29 DeviceInfo存入文件
5.5
Merge remote-tracking branch 'origin/zjw' into zhouqj

Conflicts:
	TouchLogger/AndroidManifest.xml
	TouchLogger/src/zju/ccnt/xptools/MainActivity.java
	TouchLogger/src/zju/ccnt/xptools/util/ConfData.java
	TouchLogger/src/zju/ccnt/xptools/util/FileUtil.java
	TouchLogger/src/zju/ccnt/xptools/util/JsonUtil.java
增加了InputStream
Merge remote-tracking branch 'origin/zjw' into zhouqj

Conflicts:
	TouchLogger/src/zju/ccnt/xptools/syn/SynManager.java
	TouchLogger/src/zju/ccnt/xptools/syn/SynRunnable.java
	TouchLogger/src/zju/ccnt/xptools/syn/SynService.java
	TouchLogger/src/zju/ccnt/xptools/syn/TouchDataSynRunnable.java
SynRunnable->SyncRunnable