formatting and spacing
no need to internationalise non language attributes
Merge branch 'master' into use-correct-escaping-functions
Merge pull request #405 from humanmade/use-correct-escaping-functions

Use correct escaping functions
fix merge conflict in admin/backups