Added the AllowedDiscussionTypes column to the category table.
Merge branch 'master' of github.com:vanillaforums/Garden
Revert "Emotify: add html decode to parsing, closes #1282"

This reverts commit 341fcfdd988f7412f443cd3781783b110d9bc041.
Revert "Compatibility for Reporting 2.0"

This reverts commit 8cb92ba0b19633af76a321c9da4ad6c1824468b9.
Added GDN_Discussion.DefaultDiscussionType column.
Merge branch 'master' of github.com:vanillaforums/Garden
Added CategoryModel::PermissionCategory().
Coerce gender into u, m, f.
- Added Gdn_Form->Captcha().
- Added the proper script require in ValidateCaptcha.
Added captcha validation to approval registration.
Merge branch 'master' of https://github.com/vanillaforums/Garden