Merge pull request #9 from geniewang/GBranch

G branch
Change type of dishID from String to ObjectId
Merge pull request #10 from geniewang/GBranch

final merged copy
Add gitignore
Merge branch 'TBranch' into beta
Added SimilarityReader and Recommend.
Jersey Service
Add WebExperiment.
maven service first commit
syntax error
test git pull and fetch
test git pull
delete useless files
delete
Merge branch 'YBranch' into beta

Conflicts:
	.DS_Store
	Eatopian/.classpath
	Eatopian/src/com/eatopian/entity/Restaurant.java
Merge branch 'beta' of https://github.com/geniewang/eatopian-server into beta
Merge branch 'beta' into GBranch

Conflicts:
	distance/.project
	distance/src/main/java/com/eatopian/entity/Address.java