Merge remote-tracking branch 'remotes/origin/Dev-Lena' into Emil-Dev

Conflicts:
	Simplanum Extension/js/c/notepad.js