Fixed a mergeError
Merge branch 'master' into area
Changed searchview to use button class