Merge remote-tracking branch 'origin/allin'

Conflicts:
	src/main/java/Model/Player.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Model/Player.java
Fixed bug with not divided postion of player.