Merge branch 'master' into Halcyon

Conflicts:
	loka/templates/map.html
	loka/templates/townslist.html
	static/js/convex_hull.js
Merge remote-tracking branch 'origin/Halcyon' into Halcyon

Conflicts:
	loka/templates/map.html
	loka/templates/townslist.html
Oh boy talent calculator!