Fixed windows build with conflict resolve
Improve Android pause/resume behavior.
Select EGL config when creating the EGL surface
Adds SDL_GameControllerAddMappingsFromFile
Adds controllermap utility to test suite.
Adding WhatsNew.txt changes

...before I forget them.
Fixed error return value in SDL_EGL_CreateSurface(), thanks to Mike Kasprzak
Adds SDL_GameControllerAddMappingsFromRW, updates controllermap

SDL_GameControllerAddMappingsFromFile is now a convenience macro.

controllermap can now skip bindings by pressing space or clicking/touching the
screen.
[Android] Signal the resume semaphore after pushing the relevant events

Ref: Request in #2242
[Android] Handle native thread finishing when not commanded from the Java side
Clean up the cursor clipping area when quitting SDL.
This fixes the cursor being clipped after the streaming client quits when streaming Dungeons of Dredmor
Added code missed in the resolve
Added missing header for file IO
Fixed compiler warning on Visual Studio
Fixed detecting the wired XBox 360 controller on Linux
Also added some more debug output to detect issues
Fixed crash if no window has keyboard focus
Associate the environment with any thread that calls Android_JNI_GetEnv(), in case it's been manually created with pthread_create() or C++11.