add search button to the page
solved confict on service.js
Merge branch 'kingstenbanh-master'