websearch master
Merge branch 'master' of https://github.com/manuelpolzhofer/NI_WebMiningSearch

Conflicts:
	target/classes/web/SearchServlet.class
boolean search