add search_bar in search page & category & show in map button
Merge branch 'master' of https://github.com/yinggao/Android-18641-mealorder

merge with side bar