Merge branch 'master' into ishin
Merge branch 'ishin'
Merge branch 'ishin'

Made the List Databases into alphabetical sort, and added search
function.