updated function name and added search text in search box
Added angular js files into assets/javascript
Style update
conflict resolution