Search button now searches as well
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #23 from ndhoule/development

Wired up search button