Commit
Merge branch 'master' of github.com:jbouchet/industrialisationGCJB

Conflicts:
	.gradle/2.0/taskArtifacts/cache.properties.lock
	.gradle/2.0/taskArtifacts/fileHashes.bin
Merge branch 'master' of github.com:jbouchet/industrialisationGCJB
Merge branch 'master' of github.com:jbouchet/industrialisationGCJB
SouceSets