basicsearch timing added
Merge conflict BasicSearch.cs opgelost.
Merge branch 'raymon'