start of merchant integration
Merge branch 'master' of github.com:davedx/srmeet
more awesomeness
Merge branch 'master' of github.com:davedx/srmeet