small fix
Merge branch 'merge-gui-master' of https://github.com/imeji-community/imeji into merge-gui-master

Conflicts:
	src/main/webapp/resources/components/searchQueryDisplayArea.xhtml
	src/main/webapp/templates/template_site.xhtml