Merge remote-tracking branch 'origin/dt' into dt

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
	.settings/gradle/org.springsource.ide.eclipse.gradle.core.import.prefs
	DTGAME/.metadata/.log

	DTGAME/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	DTGAME/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	DTGAME/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	DTGAME/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	DTGAME/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

	DTGAME/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	DTGAME/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	DTGAME/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	DTGAME/.metadata/version.ini
	core/.classpath
	core/.settings/org.eclipse.jdt.core.prefs
	core/bin/com/dtg/game/DTGunts.class
	core/src/com/dtg/game/DTGunts.java
	desktop/.settings/org.eclipse.jdt.core.prefs
Merge branch 'dt'

Conflicts:
	core/bin/com/dtg/game/DTGunts.class