merchant nav
Merge remote-tracking branch 'origin/develop' into branch
Merge pull request #13 from sowmyasb/branch

merchant p=1 change