Merged latest develop. Resolved merge conflicts

.gitignore

Core/build.xml

Core/manifest.mf

Core/nbproject/project.properties

...c/org/sleuthkit/autopsy/actions/AddBookmarkTagAction.java

...rc/org/sleuthkit/autopsy/actions/AddContentTagAction.java

Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java

Core/src/org/sleuthkit/autopsy/actions/Bundle.properties

...sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java

Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java

Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties

Core/src/org/sleuthkit/autopsy/casemodule/Case.java

Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java

...hkit/autopsy/casemodule/events/AddingDataSourceEvent.java

...g/sleuthkit/autopsy/casemodule/services/Bundle.properties

...rg/sleuthkit/autopsy/casemodule/services/FileManager.java

...euthkit/autopsy/casemodule/services/NewTagNameDialog.java

...leuthkit/autopsy/casemodule/services/TagOptionsPanel.form

...leuthkit/autopsy/casemodule/services/TagOptionsPanel.java

...rg/sleuthkit/autopsy/casemodule/services/TagsManager.java