made setting of number of hexes on map happen in one place.
Merge branch 'NapOnMars' into tmcw

Conflicts:
	hexagon.php
	view.php
mapdata includs map url, replacement untis are in mapdata model now