dadadadada
SSSSSSSSSSSSSSSSS
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