trash
Merge branch 'YBranch' of https://github.com/geniewang/eatopian into GBranch

Conflicts:
	.DS_Store
	Eatopian/src/com/eatopian/entity/User.java
clean
clean
new
Merge branch 'YBranch' of https://github.com/geniewang/eatopian into GBranch

Conflicts:
	Eatopian/src/com/eatopian/entity/User.java
Merge branch 'YBranch' into GBranch
Merge branch 'YBranch' of https://github.com/geniewang/eatopian into YBranch
Genie version
Merge branch 'YBranch' into GBranch

Conflicts:
	Eatopian/.classpath
	Eatopian/src/com/eatopian/entity/User.java
	Eatopian/src/com/eatopian/service/UserService.java
Genie code
Genie all code
delete
delete DS_Store
Add distance demo
Add 2
Merge branch 'beta' into GBranch

Conflicts:
	distance/.project
	distance/src/main/java/com/eatopian/entity/Address.java
auto update to server
Merge branch 'GBranch' into beta