Added show in pet battles/override ui options
Merge remote-tracking branch 'origin/master' into wod