LocationScoredAboutnessStrategy stuff
Merge branch 'master' of https://github.com/c4fcm/CLAVIN-Server

Conflicts:
	src/test/java/edu/mit/civic/mediacloud/test/AllTestsSuite.java