Merge origin/ardfo into ardfo

Conflicts:
	module/Search/src/Search/Controller/SearchController.php
	module/Search/view/search/search/display.phtml
Merge branch 'ardfo' of https://github.com/ardfo/dev into ardfo

Conflicts:
	module/Search/view/search/search/widget.phtml