Fixed search - now returns more results than ever!
Merge branch 'feature/backend' into develop

Conflicts:
	src/dataplay/search.go