search layout finished
Merge branch 'master', remote-tracking branch 'origin'
Merge branches 'search' and 'master'
fixed errors during merge