Small bug fixes and debugging
Merge branch 'search' of https://github.com/luuse/NoHassleShare into search

Conflicts:
	search/src/NHSDatabaseController.h