Merge pull request #427 from css-iter/master

Merge CSS Logbook bug fix
opibuilder: Add preference for default style 'classic' or 'native'

Applies to ActionButton when creating new button or loading older *.opi
files that do not specify the style.
ITER: Added preference to combine XYGraph buttons
Merge pull request #432 from ControlSystemStudio/bug413

opibuilder: Add preference for default style 'classic' or 'native'
#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
Added jython commands for opening file dialogs in specfied directories
Setting the format disables the auto format, so the restore from the file might be incorrect (solves #429).
Merge pull request #436 from jbobnar/master

Setting the format disables the auto format of the axis: fixes #429
Merge pull request #435 from mattclarke/master

Added jython commands for opening file dialogs in specfied directories
Improved the optimized data retrieval to load the raw data, when there are less points than requested.
Updated the junit tests.
Merge pull request #443 from jbobnar/master

Improved the optimized data retrieval
OpenPerspectiveAction: Unify, update for E4

Update OpenPerspectiveAction to allow use with both E3 and E4 (compat).
Extract PerspectiveHelper from OpenPerspectiveAction.
Move from apputil.ui to ui.util to allow use in opibuilder.
Use same code to show (or reset) perspective in OPI, alarm, scan,
databrowser, ...
Merge pull request #444 from ControlSystemStudio/bug324

OpenPerspectiveAction: Unify, update for E4
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