Merge remote-tracking branch 'origin/170_fix_runtime_ubuntu'
Merge in master and fix css conflict
Merge branch '161-list-variables-on-search' into next

Conflicts:
	web/apps/archive/archive.css