Merge pull request #5 from cdman/development

Merged with upstream and moved SSO sign-in to plugin
Move json hash from users controller to NicknameUnavailable
FIX: New line insertion when a line begins with []
Merge pull request #1384 from einarj/nickname_unavailable_generates_error_json

Nickname unavailable generates error json
FIX: Failing spec
Revert "FIX: New line insertion when a line begins with []"

This reverts commit f84630a54d273d823c0b799dc147aeddc377f79e.
Revert "FIX: Failing spec"

This reverts commit 2df2838f40dc2dd71ffc24365ded7f34037c6ae5.
Replace Markdown Linebreak Regexp with node parser.
added quotes
Handle overflowing values on admin logs pages
Check daily if there are new users who need to be approved and send a pm to moderators
FIX: Single quotes in search terms would raise an error.
FIX: Allow backticks in code blocks
FIX: schemaless urls in emails
Merge pull request #1387 from ZogStriP/fix-schemaless-urls-in-emails

FIX: schemaless urls in emails
Merge pull request #1386 from Andersos/patch-1

added quotes
upgrade rails 4
revert non queuing of emails
BUGFIX: When running under a forking server (apache or unicorn) openid strategy was caching a redis connection from the parent, this made "login with google" only work some of the time.
recover from bad CSRF tokens without requiring a hard refresh of the browser