Make the composer and TopicCreator use category id instead of category name

Also fixes #1171
Added backwards compatibility for topic creation
Move json hash from users controller to NicknameUnavailable
Merge remote-tracking branch 'upstream/master' into heroku
Merge branch 'heroku' of github.com:LaunchAcademy/discourse into heroku
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