Merge pull request #817 from berryma4/master

increase versions; added import for javax.ws to o.c.shift.viewer
o.c.u.shift: increase version
Merge branch 'master' of https://github.com/ControlSystemStudio/cs-studio