Merge origin/master

Conflicts:
	src/harusame/core/view/PlayerRepresentation.java
Merge origin/master

Conflicts:
	src/harusame/core/view/PlayerRepresentation.java