add search button to the page
solved confict on service.js
Merge branch 'kingstenbanh-master'
Merge pull request #50 from chiaS/master

solved confict on service.js