Merge branch 'develop' into feature/text-editor

Conflicts:
	SuperbEdit.Base/Config.cs