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