Merge branch 'dev' of https://github.com/oxygenxml/userguide into dev

Conflicts:
	DITA/chapter.edting-documents.ditamap