working on to do list
remove conflicts
searching and product/service working 20-sep
Merge pull request #409 from vaibhavcisin274/vaibhav

searching and product/service working 20-sep
Merge pull request #412 from vaibhavcisin274/anshul

Anshul
remove conflicts in estimate/show and gemlock#21 sep