fixes in list and welcome merchant screen
Merge branch 'master' of https://github.com/saurabh29july/RegularsPlatform