Normalize line endings
remove trailing whitespace
Merge remote-tracking branch 'remotes/origin/place-name-tagging'

Conflicts:
	Core/src/main/java/org/opensextant/extractors/geo/rules/Cantilever.java
	Core/src/main/java/org/opensextant/extractors/geo/rules/CantileverPR.java
	Core/src/main/java/org/opensextant/extractors/geo/rules/Scorer.java
	solr/build-taxcat.xml
	solr/build.xml
	solr/gazetteer/conf/schema.xml
	solr/gazetteer/conf/shchema-phonetics-include.xml
	solr/gazetteer/conf/solrconfig.xml
	solr/solr.xml