* Merge with heidi related changes (basically only SingleLineMode)
* Readd missing file changelog.htm to keep that file list consistent with the downloaded one
* Merge our own compiler detection again
* Disable including a further compiler includefile jedi.inc