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.
Merge branch 'hotfix/2.1a37' into release/2.1b1

Conflicts:
	applications/vanilla/models/class.categorymodel.php
	applications/vanilla/views/categories/helper_functions.php
	applications/vanilla/views/discussions/table.php
	index.php
Support crypt hash method.
User merge api endpoint.
Merge branch 'release/2.1b1' of github.com:vanillaforums/Garden into release/2.1b1