diff --git a/CMakeExternals/CTK.cmake b/CMakeExternals/CTK.cmake
index efc9d75480..f4c14ea98f 100644
--- a/CMakeExternals/CTK.cmake
+++ b/CMakeExternals/CTK.cmake
@@ -1,124 +1,124 @@
 #-----------------------------------------------------------------------------
 # CTK
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_CTK)
 
   # Sanity checks
   if(DEFINED CTK_DIR AND NOT EXISTS ${CTK_DIR})
     message(FATAL_ERROR "CTK_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj CTK)
   set(proj_DEPENDENCIES )
   set(CTK_DEPENDS ${proj})
 
   if(NOT DEFINED CTK_DIR)
 
     set(revision_tag cbd8b4b4)
     #IF(${proj}_REVISION_TAG)
     #  SET(revision_tag ${${proj}_REVISION_TAG})
     #ENDIF()
 
     set(ctk_optional_cache_args )
     if(MITK_USE_Python)
       if(NOT MITK_USE_SYSTEM_PYTHON)
         list(APPEND proj_DEPENDENCIES Python)
       endif()
       list(APPEND ctk_optional_cache_args
            -DCTK_LIB_Scripting/Python/Widgets:BOOL=ON
            -DCTK_ENABLE_Python_Wrapping:BOOL=ON
            -DCTK_APP_ctkSimplePythonShell:BOOL=ON
            -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
            -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
            -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2}
            -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
       )
     else()
       list(APPEND ctk_optional_cache_args
            -DCTK_LIB_Scripting/Python/Widgets:BOOL=OFF
            -DCTK_ENABLE_Python_Wrapping:BOOL=OFF
            -DCTK_APP_ctkSimplePythonShell:BOOL=OFF
       )
     endif()
 
     if(MITK_USE_DCMTK)
       list(APPEND ctk_optional_cache_args
            -DDCMTK_DIR:PATH=${DCMTK_DIR}
            -DDCMTK_CMAKE_DEBUG_POSTFIX:STRING=d
           )
       list(APPEND proj_DEPENDENCIES DCMTK)
     else()
       list(APPEND ctk_optional_cache_args
            -DDCMTK_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_DCMTK_085525e6.tar.gz
           )
     endif()
 
     if(CTEST_USE_LAUNCHERS)
       list(APPEND ctk_optional_cache_args
         "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake"
       )
     endif()
 
     set (ctk_qt_args -DCTK_QT_VERSION:STRING=${DESIRED_QT_VERSION})
 
     if (DESIRED_QT_VERSION MATCHES "4")
       list(APPEND ctk_qt_args -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
     endif()
 
     FOREACH(type RUNTIME ARCHIVE LIBRARY)
       IF(DEFINED CTK_PLUGIN_${type}_OUTPUT_DIRECTORY)
         LIST(APPEND mitk_optional_cache_args -DCTK_PLUGIN_${type}_OUTPUT_DIRECTORY:PATH=${CTK_PLUGIN_${type}_OUTPUT_DIRECTORY})
       ENDIF()
     ENDFOREACH()
 
     ExternalProject_Add(${proj}
       LIST_SEPARATOR ${sep}
       #URL https://www.dropbox.com/s/j9ii4udqfa6jn2k/CTK-CGS-2015.06_dcc02437.tar.gz
       #URL_MD5 1720e40402238619908c55a44d5036ff
       GIT_REPOSITORY https://github.com/AndreasFetzer/CTK.git
       GIT_TAG origin/ctk-for-mitk-cgs-workbench-2015.06
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${ctk_optional_cache_args}
         ${ctk_qt_args}
         # The CTK PluginFramework cannot cope with
         # a non-empty CMAKE_DEBUG_POSTFIX for the plugin
         # libraries yet.
         -DCMAKE_DEBUG_POSTFIX:STRING=
         -DGit_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
         -DGIT_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
         -DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON
         -DCTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON
         -DCTK_LIB_PluginFramework:BOOL=ON
         -DCTK_LIB_DICOM/Widgets:BOOL=ON
         -DCTK_LIB_XNAT/Core:BOOL=ON
         -DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON
         -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON
         -DCTK_USE_GIT_PROTOCOL:BOOL=OFF
         -DDCMTK_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_DCMTK_085525e6.tar.gz
         # See bug 19073
         -DPythonQt_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/PythonQt_36ab9c7c.tar.gz
-        -DqRestAPI_URL:STRING=https://www.dropbox.com/s/ecrg9mc7ytw40li/qRestAPI_db64f424.tar.gz
+        -DqRestAPI_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qRestAPI_c5e4c2a7.tar.gz
       CMAKE_CACHE_ARGS
         ${ep_common_cache_args}
       CMAKE_CACHE_DEFAULT_ARGS
         ${ep_common_cache_default_args}
       DEPENDS ${proj_DEPENDENCIES}
      )
 
     ExternalProject_Get_Property(${proj} binary_dir)
     set(CTK_DIR ${binary_dir})
     #set(CTK_DIR ${ep_prefix})
     #mitkFunctionInstallExternalCMakeProject(${proj})
 
   else()
 
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
   endif()
 
 endif()
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp
index c91c237185..696d5dc23f 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp
@@ -1,296 +1,300 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkGetPropertyService.h"
 #include "QmitkPropertyItemDelegate.h"
 #include "QmitkPropertyItemModel.h"
 #include <mitkBaseProperty.h>
 #include <mitkFloatPropertyExtension.h>
 #include <mitkIntPropertyExtension.h>
 #include <mitkIPropertyExtensions.h>
 #include <QComboBox>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QSpinBox>
 #include <algorithm>
 
 QmitkComboBoxListView::QmitkComboBoxListView(QComboBox* comboBox)
   : m_ComboBox(comboBox)
 {
 }
 
 QmitkComboBoxListView::~QmitkComboBoxListView()
 {
 }
 
 void QmitkComboBoxListView::paintEvent(QPaintEvent* event)
 {
   if (m_ComboBox != NULL)
   {
     QStyleOptionComboBox option;
 
     option.initFrom(m_ComboBox);
     option.editable = m_ComboBox->isEditable();
 
     if (m_ComboBox->style()->styleHint(QStyle::SH_ComboBox_Popup, &option, m_ComboBox))
     {
       QStyleOptionMenuItem menuOption;
       menuOption.initFrom(this);
       menuOption.palette = this->palette();
       menuOption.state = QStyle::State_None;
       menuOption.checkType = QStyleOptionMenuItem::NotCheckable;
       menuOption.menuRect = event->rect();
       menuOption.maxIconWidth = 0;
       menuOption.tabWidth = 0;
 
       QPainter painter(this->viewport());
       m_ComboBox->style()->drawControl(QStyle::CE_MenuEmptyArea, &menuOption, &painter, this);
     }
   }
 
   QListView::paintEvent(event);
 }
 
 void QmitkComboBoxListView::resizeEvent(QResizeEvent* event)
 {
   int width = this->viewport()->width();
   int height = this->contentsSize().height();
 
   this->resizeContents(width, height);
 
   QListView::resizeEvent(event);
 }
 
 QStyleOptionViewItem QmitkComboBoxListView::viewOptions() const
 {
   QStyleOptionViewItem option = QListView::viewOptions();
   option.showDecorationSelected = true;
 
   if (m_ComboBox != NULL)
       option.font = m_ComboBox->font();
 
   return option;
 }
 
 class PropertyEqualTo
 {
 public:
   PropertyEqualTo(const mitk::BaseProperty* property)
     : m_Property(property)
   {
   }
 
   bool operator()(const mitk::PropertyList::PropertyMapElementType& pair) const
   {
     return pair.second.GetPointer() == m_Property;
   }
 
 private:
   const mitk::BaseProperty* m_Property;
 };
 
 QmitkPropertyItemDelegate::QmitkPropertyItemDelegate(QObject* parent)
   : QStyledItemDelegate(parent)
 {
 }
 
 QmitkPropertyItemDelegate::~QmitkPropertyItemDelegate()
 {
 }
 
 QWidget* QmitkPropertyItemDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   QVariant data = index.data(Qt::EditRole);
 
   if (data.isValid())
   {
     if (data.type() == QVariant::Int)
     {
       QSpinBox* spinBox = new QSpinBox(parent);
 
       mitk::IPropertyExtensions* extensions = mitk::GetPropertyService<mitk::IPropertyExtensions>();
       std::string name = this->GetPropertyName(index);
 
       if (extensions != NULL && !name.empty() && extensions->HasExtension(name))
       {
         mitk::IntPropertyExtension::Pointer extension = dynamic_cast<mitk::IntPropertyExtension*>(extensions->GetExtension(name).GetPointer());
 
         if (extension.IsNotNull())
         {
           spinBox->setMinimum(extension->GetMinimum());
           spinBox->setMaximum(extension->GetMaximum());
           spinBox->setSingleStep(extension->GetSingleStep());
         }
       }
 
       connect(spinBox, SIGNAL(editingFinished()), this, SLOT(OnSpinBoxEditingFinished()));
 
       return spinBox;
     }
 
     if (data.type() == QVariant::Double || static_cast<QMetaType::Type>(data.type()) == QMetaType::Float)
     {
       QDoubleSpinBox* spinBox = new QDoubleSpinBox(parent);
 
       mitk::IPropertyExtensions* extensions = mitk::GetPropertyService<mitk::IPropertyExtensions>();
       std::string name = this->GetPropertyName(index);
 
       if (extensions != NULL && !name.empty() && extensions->HasExtension(name))
       {
         mitk::FloatPropertyExtension::Pointer extension = dynamic_cast<mitk::FloatPropertyExtension*>(extensions->GetExtension(name).GetPointer());
 
         if (extension.IsNotNull())
         {
           spinBox->setMinimum(extension->GetMinimum());
           spinBox->setMaximum(extension->GetMaximum());
           spinBox->setSingleStep(extension->GetSingleStep());
           spinBox->setDecimals(extension->GetDecimals());
         }
       }
       else
       {
         spinBox->setSingleStep(0.1);
         spinBox->setDecimals(4);
       }
 
       if (name == "opacity") // TODO
       {
         spinBox->setMinimum(0.0);
         spinBox->setMaximum(1.0);
       }
+      if (name == "ScalarsRangeMaximum" || name == "ScalarsRangeMinimum")
+      {
+        spinBox->setMaximum(5000);
+      }
 
       connect(spinBox, SIGNAL(editingFinished()), this, SLOT(OnSpinBoxEditingFinished()));
 
       return spinBox;
     }
 
     if (data.type() == QVariant::StringList)
     {
       QComboBox* comboBox = new QComboBox(parent);
       comboBox->setView(new QmitkComboBoxListView(comboBox));
 
       comboBox->addItems(data.toStringList());
 
       connect(comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnComboBoxCurrentIndexChanged(int)));
 
       return comboBox;
     }
   }
 
   return QStyledItemDelegate::createEditor(parent, option, index);
 }
 
 std::string QmitkPropertyItemDelegate::GetPropertyName(const QModelIndex& index) const
 {
   if (m_PropertyList.IsNotNull())
   {
     mitk::BaseProperty* property = reinterpret_cast<mitk::BaseProperty*>(index.data(mitk::PropertyRole).value<void*>());
     const mitk::PropertyList::PropertyMap* propertyMap = m_PropertyList->GetMap();
 
     mitk::PropertyList::PropertyMap::const_iterator it = std::find_if(propertyMap->begin(), propertyMap->end(), PropertyEqualTo(property));
 
     if (it != propertyMap->end())
       return it->first;
   }
 
   return "";
 }
 
 void QmitkPropertyItemDelegate::OnComboBoxCurrentIndexChanged(int)
 {
   QComboBox* comboBox = qobject_cast<QComboBox*>(sender());
 
   emit commitData(comboBox);
   emit closeEditor(comboBox);
 }
 
 void QmitkPropertyItemDelegate::OnSpinBoxEditingFinished()
 {
   QAbstractSpinBox* spinBox = qobject_cast<QAbstractSpinBox*>(sender());
 
   emit commitData(spinBox);
   emit closeEditor(spinBox);
 }
 
 void QmitkPropertyItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   QVariant data = index.data();
 
   if (index.column() == 1 && data.type() == QVariant::Color)
   {
     painter->fillRect(option.rect, data.value<QColor>());
     return;
   }
 
   QStyledItemDelegate::paint(painter, option, index);
 }
 
 void QmitkPropertyItemDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
   QVariant data = index.data(Qt::EditRole);
 
   if (!data.isValid())
     return;
 
   if (data.type() == QVariant::StringList)
   {
     QComboBox* comboBox = qobject_cast<QComboBox*>(editor);
     comboBox->setCurrentIndex(comboBox->findText(index.data().toString()));
   }
   else
   {
     QStyledItemDelegate::setEditorData(editor, index);
   }
 }
 
 void QmitkPropertyItemDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
   QVariant data = index.data(Qt::EditRole);
 
   if (!data.isValid())
     return;
 
   if (data.type() == QVariant::Int)
   {
     QSpinBox* spinBox = qobject_cast<QSpinBox*>(editor);
     model->setData(index, spinBox->value());
   }
   else if (data.type() == QVariant::Double)
   {
     QDoubleSpinBox* spinBox = qobject_cast<QDoubleSpinBox*>(editor);
     model->setData(index, spinBox->value());
   }
   else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::Float)
   {
     QDoubleSpinBox* spinBox = qobject_cast<QDoubleSpinBox*>(editor);
     model->setData(index, static_cast<float>(spinBox->value()));
   }
   else if (data.type() == QVariant::StringList)
   {
     QComboBox* comboBox = qobject_cast<QComboBox*>(editor);
     model->setData(index, comboBox->currentText());
   }
   else
   {
     QStyledItemDelegate::setModelData(editor, model, index);
   }
 }
 
 void QmitkPropertyItemDelegate::SetPropertyList(mitk::PropertyList* propertyList)
 {
   if (m_PropertyList.GetPointer() != propertyList)
     m_PropertyList = propertyList;
 }