Modification to listpokemon activity
Fixed issue with crashing due to Null Pointer in DisplayPokemon
Merge remote-tracking branch 'origin/master' into Ben
Merged Master in