SAT-929 SAT-945
[some commits for save changes]
[some later commit]
Merge branch 'master' of github.com:viveksh/satudunia
Merge branch 'master' of github.com:DinshawRaje/satudunia
changes at profile settings 16aug
[resolved issue SAT-926]
[Dinshaw changes]
sprint-47 resolved issues SAT-930, SAT-931, SAT-932, SAT-933, SAT-937, SAT-938, SAT-939, SAT-940, SAT-941, SAT-942, SAT-946