Merge branch 'jgrpp' into jgrpp-beta

# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp

src/town_gui.cpp

@@ -1390,7 +1390,7 @@ public:
 			}
 		}
 		/* put a terminator on the list to make counting easier */
-		this->house_sets.push_back((uint)this->size());
+		this->house_sets.push_back((uint16)this->size());
 	}
 };