sFDF
Merge branch 'Original' of https://github.com/beanmachine44/M2 into Original

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/outputFileStates.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin