merging origin development
Merge branch 'development' of github.com:warrieka/geopunt4Qgis into development

Conflicts:
	ui_geopunt4QgisBatchGeoCode.py