Use of Java 7/8 built-in script engine for BOY (#528).
Fix Java<->JS array converters (#528).
Merge pull request #3 from diirt/master

Updated PvManager, graphene and pretunr
Merge branch '3.3.x' of https://github.com/ControlSystemStudio/cs-studio.git into nsls2-3.3.x
Updating the nsls2 product to include preturn
preturn: fixing the build.properties to include the icons folder
Merge branch 'master' of https://github.com/diirt/cs-studio-integration.git into nsls2-3.3.x
Merge pull request #4 from ControlSystemStudio/logbook

Logbook
Merge pull request #5 from ControlSystemStudio/3.3.x_issue594

3.3.x issue594
Merge pull request #6 from diirt/master

Fixing Use of StartEndRangeWidget
create export logs function, will allow user to export to a tab delimited file the selected columns for multiple logs
clean up dialog:=
clean code
Backup of current ITER HMI Template draft
Change rollback of ITER HMI Template - font, color, OPI examples, as it
does not apply to CODAC Core System 4.3 release
The initialization of org.csstudio.scan/simulation_config is no more
needed as the simulation configuration file is obsolete
Symbol Library OPI illustration using sash container
o.c.opibuilder: Delete body.html that's in o.c.opibuilder.rap

.. and only used for RAP
Webopi: Fix issue with Firefox 29 and newer

Would be fixed in RAP 2.3, but that's not out, so using the fix
described on
https://wiki.eclipse.org/RAP/FAQ#Blank_page_or_client_crash_in_Firefox_29.2B
RAP DataBrowser: Allow use with Firefox version 29+