Merge branch 'bug-12506-plugin-for-ctk-cli-orig' into bug-12506-plugin-for-ctk-cli
Conflicts: Modules/Qmitk/QmitkDataStorageComboBox.h
Removed trailing whitespaces and new lines.
Reviewed-by: Sascha Zelzer <s.zelzer@dkfz-heidelberg.de>