Sprint-48 SAT-928
resolved issues of sprint 47 SAT-925
Merge branch 'master' of github.com:DinshawRaje/satudunia
[editing partial]
[commit for team members]
[some modifications for team member]