integrated search function, added registration in progress...
changed db location
merge
Fix merge conflicts