FIX: instructions in import script
FEATURE: enter key in site setting input saves it
Expect the right error in reciever_spec

Makes the tests less likely to silently break
Change default email_in minimum trust to 2

Also, rename MinTrustToCreateTopicSetting to TrustLevelSetting, and apply it to more settings
line up modal nav pills better
Merge pull request #2529 from riking/email

Two light commits for email
Fix /p/post/user route not saving referrals

Make user id optional for /p/id/uid
Add /posts/id/raw route for debugging failed post processing
Merge pull request #2531 from riking/post-route

Fix /p/post/user route not saving referrals
fixing onebox image width bug
Merge pull request #2533 from awesomerobot/master

fixing onebox image width bug
further improvements to Admin Quick Start Guide
Revert "FEATURE: reject accounts created with an email address similar to a known spammer email"

This reverts commit 39be48a441cda05e7efafefcd919326731778625.

Conflicts:
	spec/models/screened_email_spec.rb
SECURITY: Don't allow badges on read restricted categories
FEATURE: reject accounts created with an email address similar to a known spammer email
add safety for max levenshtein spammer distance
FIX: appears broken in multisite
Merge branch 'master' of github.com:discourse/discourse
fixing appearance of horizontal scrollbar on topic list at about 996px wide
minor alignment fixes on badge page w/description
Merge pull request #2534 from awesomerobot/master

fixing appearance of horizontal scrollbar on topic list at about 996px wide