Fix crash in unlock
Fix crash in April Friendly
Remove Pokeball from team data
Merge remote-tracking branch 'upstream/master'