Merge pull request #1238 from jeapostrophe/master

Moving function
(Android) C90 build fixes
Use C-style comments
(driver.c) Fix invalid write
(settings_data) Make sure all action setting fields are initialized
Merge pull request #1240 from heuripedes/mem-fixes

Mem fixes
(Menu) Ensure VSync is on after context reconfiguration
Merge pull request #1241 from heuripedes/menu-fixes

(Menu) Ensure VSync is on after context reconfiguration
(XMB) Code refactoring
Merge pull request #1242 from lakkatv/xmb

(XMB) Code refactoring
(XMB) Draw the setting icon like a regular node, so all categories icons can be animated in an uniform way
Merge pull request #1243 from lakkatv/xmb

(XMB) Draw the setting icon like a regular node, so all categories icons...
(AndroidManifest.xml) Version Bump
Merge pull request #1244 from lordashram/master

(AndroidManifest.xml) Version Bump
Get rid of imports in UserPreferences.java
Add Archive Options
Split up archive extract/load code into separate functions
Implement archive_mode - 0 is 'Ask', '1' is 'Load archive', '2'
is 'Open Archive'
Save archive_mode to config file and change representation
(Menu) Archive mode options now get used for 'Load Content' option too