add tags
Merge origin/ardfo into ardfo

Conflicts:
	module/Search/view/search/search/index.phtml
	public/css/style.css