last changes
Merge branch 'master' into hackathon

Conflicts:
	src/main/java/com/epam/tver/u2668/beans/GameInfo.java
	src/main/java/com/epam/tver/u2668/gamelogic/MainLogic.java