Recommitting
Merge branch 'master' of github.com:groundtruth/PoziExplorer

Conflicts:
	lib/custom/json/bendigo.json