Fix merge error.
Add the .NoPhoto class to the category photo when a user hasn't uploaded a photo.
Allow ForceInputFormatter in discussions and comments
Merge branch 'hotfix/ForceInputFormatter'
Fix CheckOrRadio value passing
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.
Support crypt hash method.
Merge branch 'master' of github.com:vanillaforums/Garden
Provide some sort of max height for the category photo. Themers can remove this restriction if need be.
Merge branch 'master' into hotfix/2.1a37
Debugger: Track cache traffic better.
Merge branch 'release/2.1b1' of github.com:vanillaforums/Garden into release/2.1b1
Debugger: Track cache traffic better.
Fix debug state check.
Fix debug state check.
Expose cache tracing as static method.
Expose cache tracing as static method.
Track total cache transfer.
Track total cache transfer.