Merged Android Stuff
Merge branch 'ChrisBranch' of https://github.com/premiumbiscuits/Non-ProfitHeroes into ChrisBranch