Added DiscussionModel->Bookmark(). It's a cleaner version of DiscussioModel->BookmarkDiscussion() that doesn't join a bunch of tables and does just the job of bookmarking.
Modified discussion/bookmark to work better as an API endpoint.
Merge branch 'master' of github.com:vanillaforums/Garden
Check the captcha setting when inserting a user with approval registration. Fixes the issue where approval registration and social connect do not work together.