modify SearchServlet.java
modify too
Merge branch 'master' into develop

Conflicts:
	src/servlet/SearchServlet.java