merge issue tackling2
merge issue tackling2

juggernaut-90/ubsmart,suramrit/ubsmart,juggernaut-90/ubsmart,rohinmittal/ubsmart,suramrit/ubsmart,rohinmittal/ubsmart,suramrit/ubsmart,rohinmittal/ubsmart,juggernaut-90/ubsmart