Synchronization

git-svn-id: http://svn.code.sf.net/p/rapidminer/code/Unuk@866 d8dd750e-dc89-4b37-8fed-34212cb4890a
Synchronization

git-svn-id: http://svn.code.sf.net/p/rapidminer/code/Unuk@867 d8dd750e-dc89-4b37-8fed-34212cb4890a
Merge branch 'master' into refactored_ui
Merge branch 'refactored_ui' into topic/focus