D
C
Commit
Merge branch 'master' of https://github.com:443/markus-wi/antares

Conflicts:
	antares-android/bin/classes/com/emveyh/antares/BuildConfig.class
	antares-android/bin/classes/com/emveyh/antares/MainActivity.class
	antares-android/bin/classes/com/emveyh/antares/R$attr.class
	antares-android/bin/classes/com/emveyh/antares/R$drawable.class
	antares-android/bin/classes/com/emveyh/antares/R$layout.class
	antares-android/bin/classes/com/emveyh/antares/R$string.class
	antares-android/bin/classes/com/emveyh/antares/R.class
	antares-desktop/bin/com/emveyh/antares/Main.class
	antares-desktop/bin/data/sprites.png
	antares-desktop/bin/data/sprites.xcf
	antares-desktop/bin/data/tiles.png
	antares/bin/com/emveyh/antares/core/CameraManager.class
	antares/bin/com/emveyh/antares/core/GlobalConfig.class
	antares/bin/com/emveyh/antares/core/TextureManager.class
	antares/bin/com/emveyh/antares/entity/Entity.class
	antares/bin/com/emveyh/antares/entity/EntityManager.class
	antares/bin/com/emveyh/antares/entity/Player.class
	antares/bin/com/emveyh/antares/input/InputManager.class
	antares/bin/com/emveyh/antares/map/MapGenerator.class
	antares/bin/com/emveyh/antares/map/MapManager.class
	antares/bin/com/emveyh/antares/map/Tile.class
	antares/bin/com/emveyh/antares/ui/UIManager.class