Small correction
Update assets.qrc

Add ZIP and RAR icons
last minute fix: Reset the control layout when upgrading from 0.9.5.

The settings are not compatible.
Visual Studio 2013 buildfix
Merge pull request #4807 from pal1000/work

Visual Studio 2013 buildfix
Add RAR and ZIP icons also for desktop qt
Add setting to disable version checks
Merge pull request #4806 from bhavin192/patch-1

Add ZIP and RAR icons for QT
Merge pull request #4804 from vnctdj/patch-1

Small correction
Update android build scripts to copy pngs. Update native with bugfix.
Update lang
Check versions less frequently, retry connections only once
Just bump the android version code for these small fixes.
Make "Download from the PPSSPP Homebrew Store" translatable in [MainMenu]
Shorten the key
Merge pull request #4814 from vnctdj/patch-1

Make "Download from the PPSSPP Homebrew Store" translatable in [MainMenu]
Add an ini option to set the emulated PSP's firmware.
Merge pull request #4816 from thedax/pspFirmwareOption

Add an ini option to set the emulated PSP's firmware.
Restore viewport when switching render targets
Merge pull request #4818 from raven02/patch-6

Restore viewport when switching render targets