[sprint-33 resolved issues SAT-380,SAT-382,SAT-383,SAT-384,SAT-387,SAT-388,SAT-389,SAT-391]
Merge branch 'master' of https://github.com/viveksh/satudunia into viveksh-master