Tweaks

Searches not yet returning results?
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/MainForm.java