Step 1: Go back to a single control map.

Break save/load for now, it will be redone.
Step 2: Multiple inputs can be mapped per psp key now, and save load works.
Step 3: Replace current key mapping dialog with a list-based one which is much more workable.
Merge branch 'master' into better-controlmap
Fix analog axis names. Make L2/R2 on x360 controllers analog.

Also slightly nicer behaviour - don't create empty mapping, instead ask for mappings immediately.
Fix up/down/left/right ordering for analog sticks
Let the user escape the controls dialog with the global back button (Esc on PC)
Merge pull request #3202 from hrydgard/better-controlmap

Better control mapping
swrast warning fixes
NewUI on by default. Not changing the name of the setting yet by choice.
Fix the settings screen layout so the back button is always visible
Update native, add checkbox for sw renderer to developer settings
Android buildfix
Disable accelerometer as axis, fix some omissions in KeyMap (doesn't actually autoload all those maps yet)
Win32 UI improvements: Improve the Emulation menu by consolidating down the sound, threading, CPU modes, and GPU modes into pop-out menus.
Eliminate most of the popup menus as per Henrik's request, and fix a minor bug with AT3+ in NewUI.
Fix some text.
Adjust rendering options position slightly.