Update  on service to correcly show the current pub when set
Merge branch 'master' of github.com:thehumblebrag/tapthat

Conflicts:
	public/scripts/controller/map.js