Merge pull request #1600 from GManzato/user_page_flat

Flatter design on User Page
FIX: emoticon :poop: wasn't working :)
fixing user title line-height, adding @mention style back in, consistent category width/alignment
FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.
merging

Merge remote-tracking branch 'upstream/master'
FIX: Show status icons on user topic pages
Merge pull request #1611 from awesomerobot/master

Category-dropdown items have consistent widths... other fixes
FIX: Some more non-english category errors
missing semi colon
FIX: Don't autolink within a markdown link.
Fix for non-english email polling.
FIX: Regression on topic list for best of links.
Typo!
Screened Urls page shows results for each domain instead of each url
Should have put order on the screened urls results
Rails 4 is now the out-of-the-box default
fix regression in Rails 4
fix multisite to work with rails 4
work around bust encodings passed in to method
mini profiler is there for a reason :)