Dixing import stub NPE
Waiting dialog fixes
(Also implemeted for find battle but commented)
Merge remote-tracking branch 'upstream/master' into waitingdialog
Merge remote-tracking branch 'upstream/master' into teambuilder
Importing WIP
Merge pull request #35 from TeToNN/teambuilder

Fixing import stub NPE
Merge pull request #36 from TeToNN/waitingdialog

Waiting dialog fixes