[sprint 47 SAT-873, SAT-911 resolved issues and some modification]
[sprint 47 resolved issues by dinshaw]
[sprint 47 resolved issues madhusudhan]
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia
7aug Sprint47 SAT-894,SAT-899,SAT-910