Bugfixes: map, scrounge button

fixed map navigation jumps
fixed scrounge button: loads right content
added colors for scrounge / base mode
Merge branch 'master' of https://github.com/Xychun/Scrounge

Conflicts:
	client/client.js
	client/game.html