Show strength on the map
Merge remote-tracking branch 'origin/master'

Conflicts:
	loka/templates/map.html
Fancier map, shows a lil' more