Consolidate most of the Garden.*.Manage permissions into Garden.Settings.Manage.
Escape the category name in Gdn_Form->CategoryDropDown().
Merge branch 'release/2.1b1' of github.com:vanillaforums/Garden into release/2.1b1
Merge branch 'hotfix/2.1a35' into release/2.1b1
Merge branch 'release/2.1b1' of github.com:vanillaforums/Garden into release/2.1b1
Merge branch 'hotfix/2.1a35'
Fix typo.
Give the app another feature bump.
htmlspecialchars the category name for table headings.
Set the proper application/javascript content type for jsonp responses.
Merge branch 'master' into release/2.1b1

Conflicts:
	index.php
Register tagging permission
Merge branch 'master' of github.com:vanillaforums/Garden
Tagging delete view.
Added category photos.
Missing categoryPhoto commit.
Category and discussion view tweaks.
Conflicts:
	applications/vanilla/views/categories/helper_functions.php
Tweak the category icon html/css.
Fix merge error.
Add the .NoPhoto class to the category photo when a user hasn't uploaded a photo.