static image search
Merge remote-tracking branch 'origin/merge-all' into merge-all

Conflicts:
	WebContent/searchProcess.jsp