Update public map
fabfile: make master branch name an env constant (=> configurable)
temporarily make public-map-hotfix the master branch
Merge branch 'public-map-hotfix'

Version: 426

Conflicts:
	sandy-disaster-recovery/app.yaml.template