Fix spelling of noscript in the settings page.
fix mentions in code blocks
Remove redundant 'are'.
Merge pull request #1272 from ugisozols/remove_redundant_are

Remove redundant 'are'.
Merge pull request #1266 from bolandrm/fix_at_sign

fix mentions in code blocks
Merge branch 'fix_spelling_on_settings' of git://github.com/makeheadspace/discourse into makeheadspace-fix_spelling_on_settings
Merge branch 'makeheadspace-fix_spelling_on_settings'

Conflicts:
	config/locales/server.en.yml
添加服务器配置
oops background-color not color
minor activation copy improvement
Front-end Optimizations
FIX: Back button broke when clicking @mentions
Add rake task multisite:rollback
Add indexes to help IncomingLinksReport, but not much. Refactor to limit result set size, but it doesn't help perf much either. SELECT COUNT(DISTINCT ...) is still slow.
Use allow_uncategorized_topics site setting in categoryChoose
Merge remote-tracking branch 'upstream/master'