jmillman 0854d5bd41 Merge branch 'develop' into hash_set_display
Conflicts:
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
2015-06-29 10:54:38 -04:00
..