Fixed issue with search button in settings.

The search button did not have a function bound to it as it's ID had been changed from 'search' to 'settings-search'.
Merge branch 'hotfix/settings-search-button'
Merge branch 'master' into develop