Merge branch 'mitk-2012.12.0' into niftk
Conflicts:
CMake/mitkMacroInstall.cmake
Core/Code/Controllers/mitkRenderingManager.cpp
Core/Code/Interactions/mitkMouseModeSwitcher.cpp
Core/Code/Rendering/mitkPointSetGLMapper2D.cpp
Modules/Qmitk/QmitkDataStorageComboBox.h