merging local with master

Merge remote-tracking branch 'upstream/master'
fixing user title line-height, adding @mention style back in, consistent category width/alignment
merging

Merge remote-tracking branch 'upstream/master'
Merge pull request #1611 from awesomerobot/master

Category-dropdown items have consistent widths... other fixes