Updated uses of new encryption artifact.
Updated name of encrption artifact.
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into encryption

Conflicts:
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
Updated attributes associated with encryption artifact.
Merge pull request #399 from jawallace/encryption

Encryption