Merging
Merge branch 'master' of https://github.com/Desmaster/2DSideRPG

Conflicts:
	src/core/game/graphics/Screen.java