merged
Merge origin/Arthur
Merge origin/hi
Merge branch 'master' of https://github.com/JannikHoelling/Game

Conflicts:
	src/Game/Editor/EditorFrame.java
	src/Game/Game.java