Update to latest version
Merge branch 'master' of https://github.com/discourse/discourse

Conflicts:
	app/assets/javascripts/discourse/lib/formatter.js
Merge branch 'master' of https://github.com/discourse/discourse
Merge branch 'master' of https://github.com/discourse/discourse
Exclude multiple categories from listings