o.c.u.shift: increase version
Merge branch 'master' of https://github.com/ControlSystemStudio/cs-studio
Merge pull request #819 from berryma4/master

o.c.u.shift: increase version
o.c.u.shift.ui: increase version
#734: Log configuration
Adding a prototype view which lists all the avaiable loggers and allows
the enabling and disabling of consoleViewerHandler and also the loggger
configuration
Conflicts:
	core/plugins/org.csstudio.logging.ui/.classpath
Merge pull request #821 from shroffk/4.0-3.3.x

Merge #734: Log configuration view from 3.3 to master