重构代码
Merge branch 'master' of https://github.com/hongliuliao/findyou.git
添加 phoneservice
Merge branch 'master' of https://github.com/hongliuliao/findyou.git

Conflicts:
	client/findyou/src/com/findyou/MyMapActivity.java