4.21 Json
commit merged files to this branch
Finish TouchDataService

20140422
Chang propertiese .
change file gitignore
properity changes
change gitignore
change gitignore
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
add JSON support
change the return value of the webservices into intenger
change the def of TouchData in server
fix some bugs
reduce warnings
fix the type of pointdata to static
change the code function of pointdata
update types of the functions
4.25 解决重叠画线问题
merged zhouqj into yemeng