Merge branch 'master' into trac-3250-MITK-2014-03-upgrade

Conflicts:
	CMake/PackageDepends/MITK_CTK_Config.cmake
	Modules/Qmitk/QmitkDataStorageTreeModel.h
Merge branch 'trac-3250-MITK-2014-03-upgrade' into niftk