Merge remote-tracking branch 'origin/master' into f11106

Conflicts:
	bundles/ch.elexis.core.ui.medication/src/ch/elexis/core/ui/medication/views/MedicationComposite.java
	bundles/ch.elexis.core.ui.medication/src/ch/elexis/core/ui/medication/views/MedicationViewHelper.java
	bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/controls/StickerComposite.java
	features/ch.elexis.core.application.feature/feature.xml