dernier patch
Merge branch 'beta' of ssh://github.com/fhacktory/yoloswag into beta

Conflicts:
	hike/templates/map.html
Merge branch 'beta' of ssh://github.com/fhacktory/yoloswag into beta
Merge branch 'beta' of ssh://github.com/fhacktory/yoloswag into beta