Fix code block for git commands
add localization to multiselect popup
BUGFIX: attachments bust under multisite
add backup links, etc
BUGFIX: no idea how this worked in test
BUGFIX: proxy_set_header is weird

in particular no inheritance IF proxy_set_header is specified in child
was supposed to say "dismiss unread"
Update combobox when contents are changed.
Don't display granted badges in the badge grant combobox.
Merge pull request #2178 from vikhyat/badge-system

Don't display granted badges in the badge grant combobox
Merge pull request #2171 from Mikulas/patch-missing-localization

add localization to post multiselect
Merge pull request #2169 from subelsky/patch-1

Fix code block for git commands
clearing up variable duplication as discussed https://github.com/discourse/discourse/pull/2174
Merge pull request #2179 from awesomerobot/master

clearing up variable duplication
update highlight.js to latest version
Remove wrench icon and auto-close options from composer. The same options are available after the topic has been created.
FIX: modal buttons on Safari iOS are at the bottom of the viewport, which is an unusable part of the screen in iOS 7. Add padding so you can scroll those buttons high enough so they're clickable. Apple, fix this garbage omgwtfbbq.
Show new sub-category styling in hamburger menu too
Category badge preview uses new sub-category badge styling in create/edit category modal
Also show new sub-category badge in the message at the bottom of a topic