Removed unused Code - from Local
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/servlet/SearchServlet.java