Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/czech.txt
#	src/order_backup.h
#	src/settings_internal.h
#	src/string.cpp
#	src/viewport.cpp

src/blitter/40bpp_anim.hpp

@@ -18,7 +18,6 @@
 class Blitter_40bppAnim : public Blitter_32bppOptimized {
 public:
 
-	// void *MoveTo(void *video, int x, int y) override;
 	void SetPixel(void *video, int x, int y, uint8 colour) override;
 	void SetPixel32(void *video, int x, int y, uint8 colour, uint32 colour32) override;
 	void SetRect(void *video, int x, int y, const uint8 *colours, uint lines, uint width, uint pitch) override;