ITER: Added preference to combine XYGraph buttons
#385 : Bug 5324 - Time Format yyyy/MM/dd hh:mm:ss.SSS
Merge of Anze's modifications on archive engine launcher
#385 : Bug 5324 - Time Format yyyy/MM/dd hh:mm:ss.SSS
Merge branch 'master' of https://github.com/ControlSystemStudio/cs-studio
ITER Scan Server: Replaced obsolete beamline.xml config
ITER CSS: Updated settings
Fixed RAP build fail (Issue #448)
Merge branch 'master' of git://io-ls-git-css-trunk/cs-studio
Merge pull request #450 from css-iter/master

Merge last ITER changes