Search form
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/index.html
Revert "Search form"

This reverts commit aaa4a29412f789441f131370b7bc24ea93d87d15.