[TASK] Initial commit
[BUGFIX] Escape HTML in translation strings
Merge Master with upstream