basic search function for testing
updated basic search function
some more search mods
updated db files
Update .gitignore
Merge branch 'henrik_dev'
Merge branch 'master' into Pettan_devBranch