dadadadada
SSSSSSSSSSSSSSSSS
Merge remote-tracking branch 'origin/beta' into tshen

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

Tshen