Entity
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/deeep/jam/screens/Core.java
	desktop/src/com/deeep/jam/desktop/DesktopLauncher.java
Entity