update WS/DAO
Merge branch 'master' of ssh://git@github.com/graphorlov/worldBattle.git