A few more changes to the search stuff...
Merge branch 'master' of https://github.com/M-S-H/hidtadb

Conflicts:
	solr/development/data/index/segments.gen