logging
Merge branch 'master' of github.com:berndw1960/creategmap

Conflicts:
	store.py