FIX: handle multiple paragraphs in email reply when parsing html
adding animation to extra-info title, and mild restructure
FIX: Don't escape HTML content on category descriptions
Merge pull request #2859 from techAPJ/patch-1

FIX: handle multiple paragraphs in email reply when parsing html
Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master

Conflicts:
	app/assets/javascripts/discourse/templates/header.hbs
Merge branch 'awesomerobot-master'
this method isn't private

cc @akshaymohite
FEATURE: Support for a `required` setting on user fields.
Merge pull request #2860 from techAPJ/patch-2

include category in List-Id instead of topic
UX: If there is a reply by email icon, don't overlap with the reply tab
Update Translations
FEATURE: add Precedence header
Merge pull request #2861 from techAPJ/patch-3

FEATURE: add Precedence header
Merge pull request #2862 from techAPJ/update-translations

Update Translations
Version bump to v1.1.0.beta5
UX: Fixed padding on reply to user
add invite advice
fix busted link
backwards link
correct badge title revocation query