print functionality updation#19sep
remove conflicts in gemfile/recurring#19sep
client account #20sep
Merge pull request #407 from vaibhavcisin274/prachi

Prachi
remove conflicts