Merge branch 'master' of https://github.com/igorko/flare-engine
Merge branch 'master' of https://github.com/clintbellanger/flare-engine
Script to workaround Android file parsing issue
Limit configuration menu options for Android

This makes only the following tabs visible
- Audio
- Interface (hardware mouse cursor is locked)
- Mods

Apologies for the amount of #ifdefs added. I tried to rearrange things
to limit the #ifdef usage a bit.
Merge pull request #1160 from dorkster/android

Limit configuration menu options for Android
Merge branch 'master' of https://github.com/clintbellanger/flare-engine
Merge pull request #1159 from igorko/master

Script to workaround Android file parsing issue
InputState: initialize all member variables.

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Merge pull request #1161 from stefanbeller/master

InputState: initialize all member variables.
InputState: Fix reorder warning and use Point for current_touch
Merge pull request #1162 from dorkster/fixes

InputState: Fix reorder warning and use Point for current_touch
Remove unused private member
Remove unused function getFileName
Remove unused function renderImage
Merge pull request #1163 from hansjoachim/fixes

A couple of fixes
Merge remote-tracking branch 'upstream/master'
Remove renderImage() from SDLHardwareRenderDevice