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.
Allow ForceInputFormatter in discussions and comments
Merge branch 'hotfix/ForceInputFormatter'
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
Use htmlspecialchars in user delete & autocomplete, s#3
Allow the config to force a notification preference.
Added notifications for wall posts.
Don't show notification preferences for notifications that are forced-on.
Added the ability to disable profile photo editing with the Garden.Profile.EditPhotos setting.
Add a css class to the edit profile button so that it can be targeted.
Allow the post discussion form to be pre-populated from the query string.
Add BB10 mobile useragent
Merge branch 'master' of github.com:vanillaforums/Garden