Merge branch 'master' of https://github.com/viveksh/satudunia into viveksh-master
Merge branch 'master' of https://github.com/DinshawRaje/satudunia into viveksh-master
Merge branch 'master' of https://github.com/Cis-Madhusudhan/satudunia into viveksh-master
[sprint 43 resolved issues SAT-623, SAT-631, SAT-633, SAT-634, SAT-635, SAT-636, SAT-637]