sprint-53 resolved issue SAT-1309
resolving conflicts
Sprint-53 SAT-1296,1302,1303 01oct
Sprint-53 SAT-1285,1293
resolve merge issue
Merge branch 'master' of github.com:DinshawRaje/satudunia
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia
remove duplicate
linit questions to 5 in rating_box