COMP: Merge branch 'bug-18735-DeleteDisplayGeometry-Clean'
COMP: Merge branch 'bug-18735-DeleteDisplayGeometry-Clean'

fmilano/mitk,NifTK/MITK,MITK/MITK,iwegner/MITK,iwegner/MITK,iwegner/MITK,iwegner/MITK,fmilano/mitk,fmilano/mitk,MITK/MITK,MITK/MITK,MITK/MITK,MITK/MITK,fmilano/mitk,NifTK/MITK,RabadanLab/MITKats,iwegner/MITK,NifTK/MITK,RabadanLab/MITKats,RabadanLab/MITKats,RabadanLab/MITKats,NifTK/MITK,NifTK/MITK,MITK/MITK,RabadanLab/MITKats,fmilano/mitk,NifTK/MITK,iwegner/MITK,RabadanLab/MITKats,fmilano/mitk,fmilano/mitk