Merge branch 'zoning' into jgrpp

Conflicts:
	src/table/sprites.h

source.list

@@ -402,6 +402,7 @@ window_gui.h
 window_type.h
 zoom_func.h
 zoom_type.h
+zoning.h
 #if WIN32
 #else
 music/bemidi.h
@@ -506,6 +507,7 @@ tree_gui.cpp
 vehicle_gui.cpp
 viewport_gui.cpp
 waypoint_gui.cpp
+zoning_gui.cpp
 
 # Widgets
 widgets/airport_widget.h
@@ -593,6 +595,7 @@ vehicle_cmd.cpp
 void_cmd.cpp
 water_cmd.cpp
 waypoint_cmd.cpp
+zoning_cmd.cpp
 
 # Save/Load handlers
 saveload/afterload.cpp