Merge pull request #431 from gogolander/test

replica path
Insert new link to form Parelon
Merge pull request #432 from panseo/test

Insert new link to form Parelon
Merge remote-tracking branch 'upstream/test' into test

Conflicts:
	app/main/_filter_view/30_navigation_bs.lua