@change: test function
Merge remote-tracking branch 'origin/master'

Conflicts:
	ted/bin/headliner/treedistance/CalculateContentSim.class
	ted/bin/headliner/treedistance/TestZhangShasha.class
	ted/src/headliner/treedistance/TestZhangShasha.java
@change: correcting the cosine implementation --- putting different
weights for the example and the question