a
Merge branch 'master' of https://github.com/zywonderful2/daidai800

Conflicts:
	Daidai800/src/com/service/DataService.java