Factory units refactoring
Merge branch 'master' of https://github.com/Lissov/beerwars.git
ExpandView refactoring start