Merge origin/master

Conflicts:
	Resources/Sprites/Player/PlayerSprites.png
Merge origin/master

Conflicts:
	Resources/Sprites/Player/PlayerSprites.png
Merge origin/master

Conflicts:
	src/harusame/core/controller/Controller.java
	src/harusame/core/model/map/MapLoader.java