Merge branch 'master' into T26840-MitkHomepageReorganization-TopLevel
- Conflicts:
- Documentation/Doxygen/2-UserManual/Applications.dox
- Documentation/doxygen.conf.in
- Plugins/org.mitk.gui.qt.ext/documentation/UserManual/MITKUserManual.dox
- Plugins/org.mitk.gui.qt.matchpoint.algorithm.batch/documentation/UserManual/Manual.dox
- Plugins/org.mitk.gui.qt.pharmacokinetics.mri/documentation/UserManual/Manual.dox