Fixes for various bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Catan/java/src/client/map/RobView.java