?
Merge remote-tracking branch 'origin/jara' into jara

Conflicts:
	client/css/module-fullsize.css
typescript