Refactor search class
Merge branch 'master' of https://github.com/Project-Props/Props

Conflicts:
	lib/search.php