Merge pull request #311 from css-iter/master

BOY: Fixed NullPointer exceptions
o.c.scan.ui.scantree: Icon "Open a new Scan Editor" removed from the toolbar #issue286
Merge branch 'master' of https://github.com/ControlSystemStudio/cs-studio