COMP: Merge from master

'master' of https://github.com/cpinter/Slicer into srt55-dicom-export

Conflicts:
	Applications/SlicerApp/Testing/Python/SubjectHierarchyGenericSelfTest.py
	Modules/Loadable/SubjectHierarchy/Logic/vtkSlicerSubjectHierarchyModuleLogic.cxx
	Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyConstants.cxx
	Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyConstants.h
	Modules/Loadable/SubjectHierarchy/MRML/vtkMRMLSubjectHierarchyNode.cxx
	Modules/Loadable/SubjectHierarchy/Resources/UI/qSlicerSubjectHierarchyModule.ui
	Modules/Loadable/SubjectHierarchy/Testing/Cxx/vtkSlicerSubjectHierarchyModuleLogicTest.cxx
	Modules/Loadable/SubjectHierarchy/Widgets/qMRMLSortFilterSubjectHierarchyProxyModel.cxx
	Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyAbstractPlugin.cxx
	Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyDefaultPlugin.cxx
	Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModule.cxx
	Modules/Loadable/SubjectHierarchy/qSlicerSubjectHierarchyModuleWidget.cxx
	Modules/Loadable/Volumes/SubjectHierarchyPlugins/qSlicerSubjectHierarchyVolumesPlugin.cxx
	Modules/Scripted/DICOMLib/DICOMPlugin.py
	Modules/Scripted/DICOMLib/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDICOMPlugin.cxx
	Modules/Scripted/DICOMLib/SubjectHierarchyPlugins/qSlicerSubjectHierarchyDICOMPlugin.h