Add more detail to hashDbCreateIndexNat error message.
Add some more info to the hashDbCreateIndexNat error msg.
Added encryption artifact.
Deprecated encryption attribute.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'jwallace/new_encryption_artifact' into develop
New TSK_MISMATCH_DETECTED artifact. Also commented out TSK_ENCRYPTION_DETECTED as an attribute so it doesn't conflict with the new TSK_ENCRYPTION_DETECTED artifact.
Changed name of extension mismatch artifact type.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
	framework/tsk/framework/services/TskBlackboard.cpp
	framework/tsk/framework/services/TskBlackboard.h
Remove line that refers to TSK_PROG_LAUNCHED, as that no longer exists.
Merge pull request #277 from SynapticNulship/develop

Add more detail to hashDbCreateIndexNat error message.
Merge pull request #283 from raman-bt/develop

Deprecated TSK_INTERESTING_FILE attribute.  TSK_INTERESTING_FILE_HIT art...
Merge branch 'develop' of https://github.com/sleuthkit/sleuthkit into develop

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
	framework/tsk/framework/services/TskBlackboard.cpp
	framework/tsk/framework/services/TskBlackboard.h