Merge branch 'master' of git@github.com:hhu-stups/tla2bAST.git

Conflicts:
	src/main/java/de/tla2bAst/Translator.java

src/main/java/de/tla2bAst/Translator.java

@@ -22,6 +22,7 @@ import tla2sany.drivers.SANY;
 import tla2sany.modanalyzer.SpecObj;
 import tla2sany.semantic.ModuleNode;
 import tlc2.tool.ModelConfig;
+import util.FileUtil;
 import util.ToolIO;
 
 public class Translator {
@@ -55,6 +56,8 @@ public class Translator {
 		}
 	}
 
+
+
 	private void findModuleFile() {
 		moduleFile = new File(moduleFileName);
 		if (!moduleFile.exists()) {
@@ -82,6 +85,7 @@ public class Translator {
 			e.printStackTrace();
 		}
 
+		modelConfig = null;
 		if (configString != null) {
 			configFile = new File("temp/" + moduleName + ".cfg");
 			try {
@@ -99,8 +103,8 @@ public class Translator {
 		parse();
 	}
 
-	public ModuleNode parseModule2()
-			throws de.tla2b.exceptions.FrontEndException {
+
+	public  ModuleNode parseModule2() throws de.tla2b.exceptions.FrontEndException {
 		String fileName = moduleFile.getName();
 		ToolIO.setUserDir(moduleFile.getParent());