Fix #21
Merge branch 'master' of https://github.com/arn3tt/WarOfKingdoms.git
Fix waitDialog + merge + #21