Hide the category drop down if there is only one allowed category.
Added the $Filter parameter to CategoryModel::GetByPermission().
Fix typo in CategoryModel->GetByPermission().
Conversations: Add some wraps to make theming more consistent.
Merge branch 'master' into release/2.2

Conflicts:
	applications/vanilla/controllers/class.postcontroller.php
	applications/vanilla/models/class.categorymodel.php
Make the menu sprites more general.
Remove CountBookmarks from the import.