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
Add the user's location to their user info.
Allow jsonp in DisccussionController->GetCommentCounts().
New Smarty plugin: {categories_link}

{category_link} is already present but links to the currently active
category and not the category index.
Merge branch 'master' of github.com:vanillaforums/Garden
Make sure to serialize the row in DiscussionModel->Save().
Merge branch 'master' of github.com:vanillaforums/Garden
Merge branch 'master' into hotfix/2.1a37
Fix security hole allowing Format to be changed during edit.
Merge branch 'master' into develop