- o.c.nams: Decision office renaming and refactoring
Merge branch 'ams_develop' into ams_refactoring

Conflicts:
	applications/plugins/org.csstudio.nams.application.department.decision/src/org/csstudio/nams/application/department/decision/DecisionDepartmentActivator.java
- o.c.nams: Decision office renaming and refactoring
- o.c.nams: Decision office renaming and refactoring
Merge remote-tracking branch 'Desy-extern/ams_develop' into ams_refactoring
o.c.nams: Fix for NullPointerException in decision office