Merge branch 'develop' into account
forgot to push delete_cardless move back
Merge branch 'develop' into setup_fix
Merge pull request #119 from GerryG/setup_fix

Setup fix
fixed render_ calls with unkeyed viewnames
fixed e/g merge conflict