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