added search functionality and database, bug fixes
Merge branch 'master' of https://github.com/Syntaf/NoJii