fixed bugs concerning search
Merge branch 'dev' of https://github.com/danidanone17/YinYangApp.git into dev