Merge branch 'master' into rails-3-develop

Conflicts:
	locale/cy/app.po
Don't nest the #public_body_show grid-row when in authority preview.
Add comment
Merge branch 'issues/wdtk-147-squashed-select-authority' into rails-3-develop
Add margin to search your contributions form
Merge branch 'hotfix/0.19.0.1' into rails-3-develop
Merge branch 'hotfix/0.19.0.2' into rails-3-develop
Fix /blog breaking if the blog has no posts
Add correct validations to CensorRule
Fix regressions in CensorRule specs

Added extra validations to match Postgres constraints
Merge branch 'issues/1704-search-contributions-margin' into rails-3-develop
Merge remote-tracking branch 'origin/hotfix/0.19.0.3' into rails-3-develop
Merge branch 'empty_blog' into rails-3-develop
Merge branch 'issues/1833-censor-rule-validation' into rails-3-develop
Temporarily disallow all robots
Replace existing PublicBodyCategories functionality with db models PublicBodyCategory and PublicBodyHeading
Use translation tables for PublicBodyCategory and PublicBodyHeading
Fix admin screen formatting issue in Chrome
Basic category admin screen
Restrict category_tag edits to empty public body categories