bug fixes, ui changes, experimental disk module
Merge remote-tracking branch 'origin/master'

Conflicts:
	Searcher.py