Blödsinn
Merge remote-tracking branch 'origin/master'

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
Merge remote-tracking branch 'origin/master'