Finish input
Merge branch 'master' into android

Conflicts:
	src/InputState.cpp
	src/InputState.h
Fix FIXME.
Add comments to saved files. Fixes reading save files under Android.
Add precision check so touch-an-wait will work on real device.
update readme
fix typo
Merge pull request #1164 from igorko/android

Fix more Android issues