Fixed map sprite colors, added new map
Merge remote-tracking branch 'origin/server' into server

Conflicts:
	src/net/fe/network/Client.java