diff --git a/Core/build.xml b/Core/build.xml
index 652b620db4..95abc75ef1 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -23,7 +23,7 @@
     <target name="getTSKJars" depends="findTSK">
         <property environment="env"/>
         <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel.jar" tofile="${basedir}/release/modules/ext/Tsk_DataModel.jar"/>
-        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.15-M1.jar" tofile="${basedir}/release/modules/ext/sqlite-jdbc-3.7.15-M1.jar"/>
+        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.8.11.jar" tofile="${basedir}/release/modules/ext/sqlite-jdbc-3.8.11.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-9.4-1201-jdbc41.jar" tofile="${basedir}/release/modules/ext/postgresql-9.4-1201-jdbc41.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/mchange-commons-java-0.2.9.jar" tofile="${basedir}/release/modules/ext/mchange-commons-java-0.2.9.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.9.5.jar" tofile="${basedir}/release/modules/ext/c3p0-0.9.5.jar"/>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 43d9f7715a..940ccc1da5 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -7,7 +7,7 @@ file.reference.postgresql-9.4-1201-jdbc41.jar=release/modules/ext/postgresql-9.4
 file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar
 file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar
 file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
-file.reference.sqlite-jdbc-3.7.15-M1.jar=release/modules/ext/sqlite-jdbc-3.7.15-M1.jar
+file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar
 file.reference.StixLib.jar=release/modules/ext/StixLib.jar
 file.reference.tika-core-1.5.jar=release/modules/ext/tika-core-1.5.jar
 file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 7f52ec6b25..d17d549fc5 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -226,8 +226,8 @@
                 <binary-origin>release/modules/ext/StixLib.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sqlite-jdbc-3.7.15-M1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sqlite-jdbc-3.7.15-M1.jar</binary-origin>
+                <runtime-relative-path>ext/sqlite-jdbc-3.8.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlite-jdbc-3.8.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/activemq-all-5.11.1.jar</runtime-relative-path>
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 8bd8328eca..1f4f0657ee 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -214,6 +214,8 @@
             <file name="Separator3.instance_hidden"/>-->
         </folder>
         <folder name="Window">
+            <file name="GroupsMenuAction.shadow_hidden"/>
+            <file name="Tools_hidden"/>
             <file name="Web_hidden"/>
             <file name="org-netbeans-modules-favorites-View.shadow_hidden"/>
             <file name="CloneDocumentAction.shadow_hidden"/>
@@ -226,6 +228,7 @@
             <file name="ViewFavoritesTabAction.shadow_hidden"/>
             <file name="org-netbeans-core-windows-actions-ResetWindowsAction.shadow_hidden"/>
             <file name="testAction.shadow_hidden"/>
+            <file name="org-netbeans-core-io-ui-IOWindowAction.shadow_hidden"/>
             <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoBefore.instance">
                 <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                 <attr name="position" intvalue="75"/>
diff --git a/ImageGallery/nbproject/platform.properties b/ImageGallery/nbproject/platform.properties
index 1554e42acf..d19032bb98 100644
--- a/ImageGallery/nbproject/platform.properties
+++ b/ImageGallery/nbproject/platform.properties
@@ -7,7 +7,7 @@ nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
 harness.dir=${nbplatform.active.dir}/harness
 bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
 # Where we get the platform from. To see what versions are available, open URL in browser up to the .../updates part of the URL
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
 cluster.path=\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/java:\
diff --git a/ScalpelCarver/nbproject/platform.properties b/ScalpelCarver/nbproject/platform.properties
index 1554e42acf..d19032bb98 100755
--- a/ScalpelCarver/nbproject/platform.properties
+++ b/ScalpelCarver/nbproject/platform.properties
@@ -7,7 +7,7 @@ nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
 harness.dir=${nbplatform.active.dir}/harness
 bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
 # Where we get the platform from. To see what versions are available, open URL in browser up to the .../updates part of the URL
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
 cluster.path=\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/java:\
diff --git a/build.xml b/build.xml
index d5dc6f796f..80a903d7a2 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
     
     <!-- Note that these values are also defined in platform.xml and those values are used to download the
       correct version of the platform.  These are used for other reasons.  We should merge the two. -->
-    <property name="netbeans-plat-version" value="7.3" />
+    <property name="netbeans-plat-version" value="8.0.2" />
     <property name="nbplatform.active.dir" value="${basedir}/netbeans-plat/${netbeans-plat-version}" />
 
     <!-- Determine platform and include specific file -->
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 1554e42acf..daf3585a7a 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -1,123 +1,30 @@
 branding.token=autopsy
 # Version of platform that is automatically downloaded
 # Note build.xml has similar definitions that should be kept in sync (manually)
-netbeans-plat-version=7.3.1
+netbeans-plat-version=8.0.2
 suite.dir=${basedir}
 nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
 harness.dir=${nbplatform.active.dir}/harness
 bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
 # Where we get the platform from. To see what versions are available, open URL in browser up to the .../updates part of the URL
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
 cluster.path=\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/java:\
     ${nbplatform.active.dir}/platform
 disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.lib.nbjavac,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.kit,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.debugger.jpda.visual,\
-    org.netbeans.modules.findbugs.installer,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.binding,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.form.nb,\
-    org.netbeans.modules.form.refactoring,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.declarative,\
-    org.netbeans.modules.java.hints.declarative.test,\
-    org.netbeans.modules.java.hints.legacy.spi,\
-    org.netbeans.modules.java.hints.test,\
-    org.netbeans.modules.java.hints.ui,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.source.queries,\
-    org.netbeans.modules.java.source.queriesimpl,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.java.testrunner,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
+    org.netbeans.api.maven,\
+    org.netbeans.libs.javafx,\
+    org.netbeans.modules.debugger.jpda.js,\
+    org.netbeans.modules.hibernate4lib,\
+    org.netbeans.modules.java.j2sedeploy,\
+    org.netbeans.modules.java.j2seembedded,\
+    org.netbeans.modules.java.j2seprofiles,\
+    org.netbeans.modules.java.metrics,\
+    org.netbeans.modules.javaee.injection,\
+    org.netbeans.modules.jellytools.java,\
     org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.checkstyle,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.refactoring,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.testng,\
-    org.netbeans.modules.testng.ant,\
-    org.netbeans.modules.testng.maven,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.netbeans.spi.java.hints
+    org.netbeans.modules.nashorn.execution,\
+    org.netbeans.modules.performance,\
+    org.netbeans.modules.whitelist
 
diff --git a/thirdparty/junit/8.0.2/junit.zip b/thirdparty/junit/8.0.2/junit.zip
new file mode 100755
index 0000000000..db1b83aea2
Binary files /dev/null and b/thirdparty/junit/8.0.2/junit.zip differ