Merge pull request #451 from vaibhavcisin274/prachi

Prachi
working on client part
remove conflicts
Merge pull request #452 from vaibhavcisin274/anshul

Anshul
#14oct dashboard