5a546bd653
Conflicts: applications/conversations/controllers/class.messagescontroller.php applications/dashboard/controllers/class.activitycontroller.php applications/dashboard/controllers/class.profilecontroller.php applications/dashboard/controllers/class.searchcontroller.php applications/dashboard/design/style.css applications/dashboard/models/class.searchmodel.php applications/dashboard/modules/class.pagermodule.php applications/dashboard/settings/structure.php applications/dashboard/views/modules/me.php applications/dashboard/views/search/results.php applications/vanilla/controllers/class.categoriescontroller.php applications/vanilla/controllers/class.discussionscontroller.php applications/vanilla/controllers/class.vanillacontroller.php applications/vanilla/models/class.categorymodel.php applications/vanilla/views/categories/all.php applications/vanilla/views/categories/table.php applications/vanilla/views/discussions/helper_functions.php applications/vanilla/views/discussions/table.php conf/config-defaults.php library/core/class.format.php library/core/functions.render.php