CSS rule for GitHub commit avatars
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
New sub-category badges in category chooser. Normalize category badge rendering code.
SECURITY: GitHub returns unvalidated emails
we don't need max width on header logo
Merge pull request #2175 from riking/class

CSS rule for GitHub commit avatars
Rename style to onebox-avatar
BUGFIX: someone missed a replacement
BUGFIX: identity_url was not fished out correctly

If I user logged in with Google and then changed email,
they would no longer be able to log in with google
Merge pull request #2183 from riking/class

Fix 0be7483f19569e0c860717d859d276363946b644
Update onebox gem
SECURITY: when enabled_local_logins is false users could log in via API

thanks @Nicholas Blanco
add localization to group administration
Merge pull request #2185 from Mikulas/patch-missing-group-l10n

add localization to group administration