Merge origin/master

Conflicts:
	src/main/java/kz/kbtu/game2048/model/GameTable.java