Merge branch 'master' of D:\WORK\JAVA\IDEA\WorldBattle with conflicts.
Merge remote-tracking branch 'origin/master'
WEB_ALL_GAMES