just commit
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/outputFileStates.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	android/build/apk/android-debug-unaligned.apk
	android/build/dex/debug/classes.dex
	android/build/incremental/mergeAssets/debug/merger.xml
	android/build/incremental/mergeResources/debug/merger.xml
	android/build/libs/android-debug.ap_
	build/dex-cache/cache.xml
	core/build/libs/core-1.0.jar
	desktop/build/libs/desktop-1.0.jar
	html/build/gwt/gen/com/badlogic/gwtref/client/IReflectionCacheGenerated.java
	html/build/gwt/gen/com/google/gwt/user/client/impl/WindowImplIE_Resources_default_InlineClientBundleGenerator.java
	html/build/gwt/work/com.tedsdream.game.GdxDefinitionSuperdev/compiler/permutation-0.js
	html/build/gwt/work/com.tedsdream.game.GdxDefinitionSuperdev/compiler/permutation-1.js
	html/build/gwt/work/com.tedsdream.game.GdxDefinitionSuperdev/compiler/permutation-2.js
	html/build/gwt/work/com.tedsdream.game.GdxDefinitionSuperdev/compiler/permutation-3.js
	html/build/gwt/work/com.tedsdream.game.GdxDefinitionSuperdev/compiler/permutation-4.js
	html/build/libs/html-1.0.war
	ios/build/libs/ios-1.0.jar
	local.properties
Merge branch 'master' of https://github.com/Franjoo/TedsDream