de
fr
nj
Merge remote-tracking branch 'origin/master'

Conflicts:
	Documents/Slides/Identity-SecurityFeatures.pptx