update SearchDaoIntegrationTest
ui
update timeout
Merge branch 'master' of https://github.com/Ekvi/ii
review
Merge remote-tracking branch 'origin/master'