New Trainer Sprite Assets
Merge pull request #125 from Fuzzysqurl/master

New Trainer Sprite Assets
Icon Set for Android
Merge pull request #126 from Fuzzysqurl/master

ORAS Pokeicon Set
Settings
Google Tracking
Shiny Pokes
Pokemon Battle info changes
Merge pull request #128 from MidwayMarshall/new-commit2

Settings/Google Tracking/Shiny Pokes/Pokemon Battle info changes
Glalie Freeze-Dry
Merge pull request #129 from Withoutatrace/master

Glalie Freeze-Dry
Merge branch 'master' of git://github.com/po-devs/android-client