Merge branch 'bug-14892-Release201309-Integration' into bug-14892-MergeBranch
Conflicts:
Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp
Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkCreateSimulationAction.cpp
Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp