grumpy cart -> john doe
Merge branch 'master' of github.com:backlift/backlift-templates