Bugfix: merge the configuration and settings (Configuration i.e. command line args have high priority)

src/com/sheepit/client/Configuration.java

@@ -58,7 +58,7 @@ public class Configuration {
 		this.static_exeDirName = "exe";
 		this.maxUploadingJob = 1;
 		this.nbCores = -1; // ie not set
-		this.computeMethod = ComputeType.CPU_ONLY;
+		this.computeMethod = null;
 		this.GPUDevice = null;
 		this.userSpecifiedACacheDir = false;
 		this.workingDirectory = null;