diff --git a/ATCS_JAR.jardesc b/ATCS_JAR.jardesc
index 06f9094..c469af0 100644
--- a/ATCS_JAR.jardesc
+++ b/ATCS_JAR.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.17.jar"/>
+    <jar path="ATContentStudio/ATCS_v0.6.18.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/hacked-libtiled/tiled/io/TMXMapReader.java b/hacked-libtiled/tiled/io/TMXMapReader.java
index 8817bcd..1e25783 100644
--- a/hacked-libtiled/tiled/io/TMXMapReader.java
+++ b/hacked-libtiled/tiled/io/TMXMapReader.java
@@ -913,7 +913,8 @@ public class TMXMapReader
     private class MapEntityResolver implements EntityResolver
     {
         public InputSource resolveEntity(String publicId, String systemId) {
-            if (systemId.equals("http://mapeditor.org/dtd/1.0/map.dtd")) {
+            if (systemId.equals("http://mapeditor.org/dtd/1.0/map.dtd") ||
+            	systemId.equals("https://mapeditor.org/dtd/1.0/map.dtd")) {
                 return new InputSource(TMXMapReader.class.getResourceAsStream(
                         "resources/map.dtd"));
             }
diff --git a/hacked-libtiled/tiled/io/TMXMapWriter.java b/hacked-libtiled/tiled/io/TMXMapWriter.java
index 775e759..9004af8 100644
--- a/hacked-libtiled/tiled/io/TMXMapWriter.java
+++ b/hacked-libtiled/tiled/io/TMXMapWriter.java
@@ -153,7 +153,7 @@ public class TMXMapWriter
     }
 
     private void writeMap(Map map, XMLWriter w, String wp) throws IOException {
-        w.writeDocType("map", null, "http://mapeditor.org/dtd/1.0/map.dtd");
+        w.writeDocType("map", null, "https://mapeditor.org/dtd/1.0/map.dtd");
         w.startElement("map");
 
         w.writeAttribute("version", "1.0");
diff --git a/packaging/ATCS_latest b/packaging/ATCS_latest
index 7f4db7f..5c06962 100644
--- a/packaging/ATCS_latest
+++ b/packaging/ATCS_latest
@@ -1 +1 @@
-v0.6.17
\ No newline at end of file
+v0.6.18
\ No newline at end of file
diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi
index 8bcbfd1..3469548 100644
--- a/packaging/Windows/ATCS_Installer.nsi
+++ b/packaging/Windows/ATCS_Installer.nsi
@@ -1,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.17"
+!define VERSION "0.6.18"
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "javaw"
 
@@ -88,7 +88,7 @@ Section install
   file "C:\AT\ATCS_source\lib\AndorsTrainer_v${TRAINER_VERSION}.jar"
   file "C:\AT\ATCS_source\lib\junit-4.10.jar"
   file "C:\AT\ATCS_source\lib\json_simple-1.1.jar"
-  file "C:\AT\temp\ATCS_v0.6.17\ATCS_v${VERSION}.jar"
+  file "C:\AT\temp\ATCS_v0.6.18\ATCS_v${VERSION}.jar"
   file "C:\AT\ATCS_source\lib\rsyntaxtextarea.jar"
   file "C:\AT\ATCS_source\lib\prefuse.jar"
   file "C:\AT\ATCS_source\lib\bsh-2.0b4.jar"
diff --git a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
index d8f110c..496dd17 100644
--- a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
+++ b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
@@ -43,7 +43,7 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.17";
+	public static final String APP_VERSION = "v0.6.18";
 	
 	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
 	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java
index 3c6e2f7..6a6359f 100644
--- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java
@@ -38,11 +38,16 @@ public abstract class JSONElement extends GameDataElement {
 			for (Object obj : gameDataElements) {
 				Map jsonObj = (Map)obj;
 				String id  = (String) jsonObj.get("id");
+				try {
 				if (id != null && id.equals(this.id )) {
 					this.parse(jsonObj);
 					this.state = State.parsed;
 					break;
 				}
+				}
+				catch(Exception e){
+					System.out.println("Error in ID: " + id);
+				}
 			}
 		} catch (FileNotFoundException e) {
 			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
index eb61b1c..afe584d 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
@@ -37,17 +37,17 @@ public class AboutEditor extends Editor {
 			"<b>Right click on the left area or use the \"File\" menu to create a project.</b><br/>" +
 			"<br/>" +
 			"Play <a href=\"https://play.google.com/store/apps/details?id=com.gpl.rpg.AndorsTrail\">Andor's Trail</a> for free on your Android device.<br/>" +
-			"Visit <a href=\"http://andorstrail.com/\">the official forum</a> to give or receive help.<br/>" +
+			"Visit <a href=\"https://andorstrail.com/\">the official forum</a> to give or receive help.<br/>" +
 			"Open the project's <a href=\"https://github.com/Zukero/andors-trail/\">GitHub project page</a> to check out the game's source code.<br/>" +
 			"<br/>" +
 			"For content creation help, make sure to use the following resources:<br/>" +
-			"<a href=\"http://andorstrail.com/viewtopic.php?f=6&t=4560\">The contribution guide on the forums</a><br/>" +
-			"<a href=\"http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section\">The developer section of the Andor's Trail wiki</a><br/>" +
+			"<a href=\"https://andorstrail.com/viewtopic.php?f=6&t=4560\">The contribution guide on the forums</a><br/>" +
+			"<a href=\"https://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section\">The developer section of the Andor's Trail wiki</a><br/>" +
 			"<a href=\"https://docs.google.com/document/d/1BwWD1tLgPcmA2bwudrVnOc6f2dkPLFCjWdn7tXlIp5g\">The design outline document on Google Drive/Docs</a><br/>" +
 			"<br/>" +
 			"<font size=+1>Credits:</font><br/>" +
 			"<br/>" +
-			"Author: <a href=\"http://andorstrail.com/memberlist.php?mode=viewprofile&u=2875\">Zukero</a><br/>" +
+			"Author: <a href=\"https://andorstrail.com/memberlist.php?mode=viewprofile&u=2875\">Zukero</a><br/>" +
 			"Licence: <a href=\"http://www.gnu.org/licenses/gpl-3.0.html\">GPL v3</a><br/>" +
 			"Sources are included in this package and on <a href=\"https://github.com/Zukero/ATCS\">GitHub</a>.<br/>" +
 			"<br/>" +