Remove call of virtual function from DataContentViewerArtifact ctor
Synchronize access to DataContentViewerArtifact.setDataView()
Cleanup of some recently added attributes.
Merge branch 'master' of https://github.com/sleuthkit/autopsy
Merge https://github.com/jawallace/autopsy into macosx
removed old sample ingest code that no longer compiled
Moved more work into the backround threads of DataContentViewerArtifact
Merge pull request #269 from raman-bt/master

Cleanup of recently added attributes.
Merge pull request #271 from rcordovano/artifact_viewer_thread

Moved more work into the backround threads of DataContentViewerArtifact
Merge branch 'forms' into macosx
Merge https://github.com/sleuthkit/autopsy
Updated FX video panel initialization
Merge https://github.com/sleuthkit/autopsy into macosx

Conflicts:
	Core/src/org/sleuthkit/autopsy/core/Installer.java
	Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
	Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
Fixed merge conflict mistake
Added comments to the USB mapping class
removed version script from build process
Updated instsaller file to have version in path.
Merge branch 'master' of github.com:sleuthkit/autopsy
Merge https://github.com/sleuthkit/autopsy into macosx
Fixed NullPointerException from JavaFx on case close.