[sprint 43 resolved issues SAT-639, SAT-638]
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia
[Sprint 43 resolved issues SAT-620, SAT-650, SAT-651, SAT-640]