change class Search and SearchTest
Merge branch 'master' into wordView

Conflicts:
	src/controllers/Search.java