dadadada
Merge remote-tracking branch 'origin/YBranch' into GBranch

Conflicts:
	dadadada
service api first submit
Merge branch 'YBranch' of https://github.com/geniewang/eatopian into GBranch

Conflicts:
	sb.txt
first version of basic classes
Farseer
Merge pull request #4 from geniewang/GBranch

Farseer
Merge remote-tracking branch 'origin/beta' into tshen

Conflicts:
	dadadada
Add similarity.java .
Merge pull request #5 from geniewang/tshen

Tshen
add some function to DAO
Merge pull request #6 from geniewang/GBranch

add some function to DAO
Merge pull request #7 from geniewang/beta

Beta