first phase code done
Merge branch 'master' into shrey-payment
some part of code done
Merge branch 'master' into shrey-payment