Merge branch 'master' into gh-pages
Updating with new icons

translation, edit, smiley, book, book-alt, shield, shield-alt,
businessman, id, id-alt, lightbulb, a single-ring WP logo, a thinner x,
and two new sets of arrows. I also reordered some of the icons to
create new groupings.
Merge branch 'gh-pages'