Android bug fixes and Windows bug fixes
Merge branch 'master' of https://github.com/Lecton/Zeon