Berliner Abendpost - Germany revamps cannabis plan after opposition