Tweak to search results.
Fix typo in VanillaSearchModel.
Remove the spam count popin from the dashboard.
Fix email confirm on new installs.
Make {activity_link} consistent with the other links.
Increase the size of reaction sprites to 16px;
Checkout {activity_link} from develop.
Add wraps to the discussions table head so that they can be targeted by css more easily.
Merge branch 'master' into release/2.2

Conflicts:
	applications/vanilla/views/discussions/table.php
	library/vendors/SmartyPlugins/function.activity_link.php
Hide the category drop down if there is only one allowed category.
Added the $Filter parameter to CategoryModel::GetByPermission().
Fix typo in CategoryModel->GetByPermission().
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Make sure .Hidden is more important.
Change comment form cancel button into a normal button.
ButtonBar: Use the AssetModel for css.
Add Attributes() method to UserModel to extract user attributes array.
Allow ProfileExtender to accept both arrays and CSVs for field lists.
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Merge branch 'hotfix/htmlfilter'