Load the data asynchronously
Move all the map stuff into a map class
Merge remote-tracking branch 'klusark/master' into HEAD

Conflicts:
	scripts/map.js