Merge branch 'master' of https://github.com/sleuthkit/autopsy
Merge branch 'master' of https://github.com/sleuthkit/autopsy
modifed FileManaget to use the new transaction based methods in SleuthkitCase for methods in the call tree of addLocalFilesDirs()
added exception handling to new transaction usage.
restored add image error display.  renamed add image wizard classes to have more meaningful names.  cleanup up add image wizard code some.
added/clarified comments
made setErrors() public so this class can be useful in other packages/modules
Reduced redundant setNode() calls in DataResultViewers
Eliminated superfluous setNode() calls in DataResultPanel, DataContentPanel
Merge pull request #287 from millmanorama/master

transaction objects
Merge pull request #291 from rcordovano/adrv_set_node_fix

Reduced redundant setNode() calls in DataResultViewers
Merge pull request #292 from rcordovano/dcp_set_node_fix

Eliminated superfluous setNode() calls in DRPanel, DCPanel
Added back in that GEN_INFO is not shown in tree
fixed wording of statement
Added timezone to times in display
Merge branch 'master' of https://github.com/jawallace/autopsy

Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
Removed color from 64 bit video controls.