added changes manually which were lost during merge
added changes manually which were lost during merge

MITK/MITK,iwegner/MITK,iwegner/MITK,lsanzdiaz/MITK-BiiG,iwegner/MITK,RabadanLab/MITKats,RabadanLab/MITKats,rfloca/MITK,iwegner/MITK,NifTK/MITK,RabadanLab/MITKats,lsanzdiaz/MITK-BiiG,rfloca/MITK,danielknorr/MITK,fmilano/mitk,MITK/MITK,RabadanLab/MITKats,iwegner/MITK,lsanzdiaz/MITK-BiiG,fmilano/mitk,RabadanLab/MITKats,danielknorr/MITK,NifTK/MITK,MITK/MITK,lsanzdiaz/MITK-BiiG,rfloca/MITK,fmilano/mitk,lsanzdiaz/MITK-BiiG,rfloca/MITK,rfloca/MITK,fmilano/mitk,danielknorr/MITK,RabadanLab/MITKats,NifTK/MITK,danielknorr/MITK,NifTK/MITK,iwegner/MITK,NifTK/MITK,MITK/MITK,lsanzdiaz/MITK-BiiG,fmilano/mitk,fmilano/mitk,danielknorr/MITK,lsanzdiaz/MITK-BiiG,rfloca/MITK,fmilano/mitk,NifTK/MITK,lsanzdiaz/MITK-BiiG,MITK/MITK,danielknorr/MITK,danielknorr/MITK,rfloca/MITK,MITK/MITK