30Aug products & services remove bugs
Conflicts remove in application.html
remove conflicts
Merge pull request #333 from vaibhavcisin274/prachi

Prachi