Remove duplicated includes
[GLES] speed up blending

(texture * color) costs us an extra operation on Mali when sent as varying.
Instead, since textures use the same color for the entire render, send it as
a uniform instead.

This does not apply to fonts, since the font and its shadow are rendered
together, and may not share a color (tested and looks bad).

This increases fps anywhere heavy blending is done.
[GLSL] cut diffuse+blend render time by 1/3

Mainly seen when we're fading in/out.

Mali likes this ordering better for some reason, ops go from 3 to 2 (according
to their profiler). Verified with PVR's compiler that there is no change, it's
2 there either way.
Fix British English spellings
dialogue      -> dialog    (when referring to GUI window items)
analogue      -> analog
color[s]      -> colour[s]
colorspace    -> colourspace
visualization -> visualisation
normalize     -> normalise
Harddisk      -> Hard disk (consistent with all other usage of "[Hh]ard disk")
disc          -> disk      (context: magnetic media)
disk          -> disc      (context: optical media)

'colourspace' -> 'colour space' nitpick
jsonrpc: fix "file" property not working in AudioLibrary.GetSongDetails (fixes #14508)
video: bring back "Mark as watched/unwatched" into main context menu
[WIN32][cpluff] fixed resource leak.
[cximage] fixed: fixed memory leaks in ximadsp.cpp
[cximage] fixed memory leak in ximatif.cpp
Merge pull request #3265 from wsoltys/cleanup

some fixes in various files
ActiveAE: only apply PCM user layout for stereo if audio switches back from multichannel
Merge pull request #3269 from FernetMenta/aefixes

Audio mode change
Merge pull request #3261 from MilhouseVH/english-fix

Fix British English spellings
[win32] fix remarks about default build
[linux] Added "Xbox 360 Wireless Receiver (XBOX)" to <altname> tags for 360 controller keymap
Merge pull request #3257 from Rawk/remove_unneeded_includes

Remove duplicated includes
[GLES] Batch textures and their borders

Gives a considerable speedup in scenes with many bordered images
(like settings).
skip dxt compression on all arm boards

The only chipset I'm aware of that can do dxt on arm is Tegra, and that's not
worth slowing everyone else down
[GLES] clear screen (in the right place) before shutdown
fixed, hook GetPreferredResolution in WinSystemEGL