Merge remote-tracking branch 'image_analyzer/develop' into image_analyzer

Conflicts:
	.gitattributes
	.gitignore
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/platform.properties
	nbproject/project.properties
	nbproject/project.xml
project changes to work as a module in Autopsy
Merge pull request #846 from millmanorama/image_analyzer

project changes to work as a module in Autopsy