Algunos refactors
Merge branch 'master' of https://github.com/Dasten/AndroidCookieClicker