Password strength tweaks:
- Lessen strength requirements.
- Make translation text translatable.
- Add some help text to password forms.
- Closes #1537.
Bump hot fix version.
Merge branch 'master' into hotfix/2.1a39
Change the stub content to reference a plugin that is in the core repo.
This is the real 2.1b1.
Add the Garden.Profile.EditPhotos to config-defaults. Closes #1569.
Add the current category section when in a discussion.
Add the category to the result array when looking at a discussion.
Add category photo delete button
Remove category announcements from normal discussions
- When editing a comment, only edit that comment and not nested forms.
- Add the discussion to the data array when editing a comment so we can generate the options menu properly.
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Merge remote-tracking branch 'origin/2.1' into release/2.2

Conflicts:
	index.php
Added the HideLast option to Gdn_Theme::Breadcrumbs().
Added Gdn_Email->AddHeader(). Closes #1572.
Added Gdn_Request->Port() and will output a non standard port in calls to Gdn_Request->Url(). Closes #1567.
Added back missing Garden.SignIn.Allow permission for the administrator.
Don't use move_uploaded_file when the source is in PATH_UPLOADS. Fixes #1565.
Added Gdn_Request->HostAndPort().
Added $WithDomain parameter to Gdn_Plugin->GetWebResource().
Don't return the url for the social icons. Fixes #1564.