Remove duplicates from User class and use Account versions
Merge branch 'develop' into account
change from base card to +*account to expire_pieces
Merge branch 'develop' into setup_fix
fixed delete_cardless call
Merge branch 'helpers' into develop
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
Fix account_details to key named view
fixed e/g merge conflict
Merge branch 'develop' into wagn2card