Liquid and others
Merge remote-tracking branch 'upstream/test' into test

Conflicts:
	app/main/_filter_view/30_navigation_bs.lua
Merge pull request #434 from gogolander/test

Functionalities