old changes
Merge branch 'battle-log' of https://github.com/NamTThai/PokemonShowdownAndroidClient into battle-log

Conflicts:
	app/src/main/java/com/pokemonshowdown/app/BattleLogDialog.java