James Allen a2bb89b579 Merge branch 'master' into master-redesign 12 rokov pred
..
coffee a2bb89b579 Merge branch 'master' into master-redesign 12 rokov pred
templates 92928c35ab removed old email tempaltes 12 rokov pred
views 81845dec32 Wire up account settings forms 12 rokov pred