Merge branch 'master' into jgrpp

# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h

src/spritecache.cpp

@@ -36,8 +36,6 @@
 /* Default of 4MB spritecache */
 uint _sprite_cache_size = 4;
 
-typedef SimpleTinyEnumT<SpriteType, byte> SpriteTypeByte;
-
 static size_t _spritecache_bytes_used = 0;
 
 PACK_N(class SpriteDataBuffer {