Fixing project for Android.
Merge branch 'master' of github.com:slembcke/GalacticGuardian
Refactoring controls to add support for Mac/controllers.
merging