Merge branch 'house_placing' into jgrpp

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp

src/settings.cpp

@@ -1071,6 +1071,14 @@ static bool TownFoundingChanged(int32 p1)
 	return true;
 }
 
+static bool AllowPlacingHousesChanged(int32 p1)
+{
+	if (_game_mode != GM_EDITOR && !_settings_game.economy.allow_placing_houses) {
+		DeleteWindowById(WC_BUILD_HOUSE, 0);
+	}
+	return true;
+}
+
 static bool InvalidateVehTimetableWindow(int32 p1)
 {
 	InvalidateWindowClassesData(WC_VEHICLE_TIMETABLE, VIWD_MODIFY_ORDERS);