Battles exit upon player death

Battles exit upon player death
Player now displays in inventory

Player now displays in inventory
Overlay now displays upon player death in battle

Overlay now displays upon player death in battle
Update BattleController.java
Player now displays in inventory

Player now displays in inventory
Merge pull request #1225 from Rhonim/master

Few fixes..
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon