more fights! more UI!
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon