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 branch 'master' into android

Conflicts:
	src/InputState.cpp
	src/InputState.h