Merge remote-tracking branch 'remotes/origin/dev-lena-bn20' into Emil-Dev-BN20

Conflicts:
	Simplanum Extension/views/notepad.html