Merge remote-tracking branch 'upstream/master'
Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories.
FIX: text node emitters should always take strings as parameters even if they
return JsonML.
Russian translation (actual version)
Improve spacing of registration form, and add instructions to the password field.
FIX: canonical url should not use the CDN
FEATURE: default_code_lang for syntax highlighting is configurable
missing site setting, this should be auto generated
fix spec, categories without position are now always at the end of the list
Admin Quick Start Guide: Change email test link

The feature has moved from `/admin/email/logs` to `/admin/email`.
[0] is shorter than [0,1] :)
FIX: ensureMaximumDimensionForImagesInPreview wasn't always working
only display inline HTML revision history on mobile
move arbitrary html content out of noscript and into the preloadstore
create_account_controller.js passwordRequired needs the same logic as user_authenticator. Make twitter and facebook signup work again.
FIX: deprecation warning in create_account_controller.js. Need to move createAccount into actions.
FIX: category_list_spec should not expect deterministic order
use a helper instead of a view for custom HTML content
Merge pull request #1742 from joallard/patch-1

[minor] Admin Quick Start Guide: Change email test link
Improve how category stats are rendered