Merge branch 'master' of https://github.com/b-change/satudunia
[changes of sat-229, sat-224, sat-248]
Merge pull request #2 from viveksh/master

SAT-237 , SAT-238 , SAT-239, SAT-240, SAT-241, SAT-242, SAT-243 , SAT-244, SAT-245, SAT-249 , SAT-224, SAT-248