Merge branch 'ams_develop' of github.com:Desy-extern/cs-studio into
ams_develop

Conflicts:
	applications/plugins/org.csstudio.nams.common/src/org/csstudio/nams/common/material/regelwerk/OderRegel.java
	applications/plugins/org.csstudio.nams.common/src/org/csstudio/nams/common/material/regelwerk/UndRegel.java
o.c.nams.common: Bugs fixed