v1
Merge branch 'master' of https://github.com/tjmgis/PostGISSearch

Conflicts:
	postgis.ini
	postgissearch.py
	ui_postgissearch.py