init
Merge branch 'master' of https://github.com/Franjoo/TedsDream

Conflicts:
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	core/build/classes/main/com/angrynerds/game/collision/Detector.class
	core/build/classes/main/com/angrynerds/gameobjects/Enemy$AnimationListener.class
	core/build/classes/main/com/angrynerds/gameobjects/Enemy.class
	core/build/classes/main/com/angrynerds/gameobjects/Player.class
	core/build/classes/main/com/angrynerds/gameobjects/map/Map$1.class
	core/build/classes/main/com/angrynerds/gameobjects/map/Map.class
	core/build/classes/main/com/angrynerds/renderer/ShadowRenderer.class
	core/build/classes/main/com/esotericsoftware/spine/AnimationState.class
	core/build/classes/main/com/esotericsoftware/spine/AnimationStatePR.class
	core/build/classes/main/com/esotericsoftware/spine/SkeletonBinary.class
	core/build/classes/main/com/esotericsoftware/spine/SkeletonJson.class
	core/build/classes/main/com/esotericsoftware/spine/attachments/AtlasAttachmentLoader.class
	core/build/classes/main/com/esotericsoftware/spine/attachments/MeshAttachment.class
	core/build/classes/main/com/esotericsoftware/spine/attachments/RegionAttachment.class
	core/build/classes/main/com/esotericsoftware/spine/attachments/RegionSequenceAttachment.class
	core/build/classes/main/com/esotericsoftware/spine/attachments/SkinnedMeshAttachment.class
	core/build/libs/core-1.0.jar
	local.properties
Merge branch 'master' of https://github.com/Franjoo/TedsDream

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	core/build/libs/core-1.0.jar
	local.properties
Merge branch 'master' of https://github.com/Franjoo/TedsDream

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	core/build/libs/core-1.0.jar

Signed-off-by: timkunkel <tim.kunkel@web.de>
some clean ups in map