start fixing htmleditor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Crystalbyte.Paranoia/UI/ParanoiaDataSource.cs