Adjust ul,ol margins
Site setting to support showing real names in posts. Also put back in type to search on site settings
Merge pull request #1601 from awesomerobot/master

main logo size consistency fix
FIX: categories created by users who are deleted cannot be deleted
add qunit to autospec
fix run-qunit
automatically make developers admins on account creation, this solves the user #1 problem
you can simply set the DEVELOPER_EMAILS to a comma delimited list and the users will be auto admined
Update client.zh_CN.yml
Merge pull request #1604 from ofgeek/patch-1

Update client.zh_CN.yml
Rails 4 changes behavior of precompile not to include originals
This patch will restore rails 3 beavior and fix emoji etc under rails 4
shorter message for untranslated strings
FIX issues with quote button

Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
revert changes to magnific-popup.scss
merging local with master

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