fixed up issues with proguard
Merge branch 'master' of https://github.com/KaeruCT/GLXY