Sprint-48 SAT-961 SAT-976 SAT-978 22aug
[sprint 48 resolved issues SAT-979, SAT-983, SAT-980, SAT-981]
Merge branch 'master' of github.com:DinshawRaje/satudunia
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia