Added the ability to watch categories that aren't included in all discussions.
Fix typo in new discussion model that caused crash when a discussion type required a specific permission.
Coerce gender into u, m, f.
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' into stage
Merge branch 'feature/mega-opt' into stage

Conflicts:
	applications/vanilla/models/class.categorymodel.php
Profile editing permission fixes
Merge branch 'stage' of github.com:vanillaforums/Garden into stage
Users.Edit permission may always ban & trumps PersonalInfo
Sync Reactions stub style & usage, move to functions.render
Better WriteReaction stub
Fix bug in CommentModel->UpdateCommentCount() where Options() was being inappropriately chained.
Split/Merge: Offer the option to leave behind a merged discussion to redirect to the new one.
Merge branch 'stage' of github.com:vanillaforums/Garden into stage
Fix the inline me box alignment.
style.css: Add default styling for menus that pop up.
Fix bad data vector in tagging
Merge branch 'stage' of github.com:vanillaforums/Garden into stage