Convex hull, baby
Merge remote-tracking branch 'origin/master'

Conflicts:
	loka/templates/map.html