Merge branch 'release/2.2.0-rc1' into 2.2/master
fix ob_end_clean error
Updated the Brazilian translation
Merge branch '2.2/feature/Installer_fix' into 2.2/develop
Merge branch 'release/2.2.4' into 2.2/master
Merge branch 'release/2.2.4' into 2.2/master
Multiselect fix for multiple permissions

Multiselect was not re-setting the "Selected" groups if more then one group was selected. This change will correctly set the selected groups for either scenario.
Merge pull request #3288 from ryantait/patch-1

Multiselect fix for multiple permissions
Merge branch '2.2/master' of https://github.com/ClaudionorBarros/pyrocms into 2.2/develop

Conflicts:
	system/cms/language/brazilian/admin_lang.php
	system/cms/language/brazilian/buttons_lang.php
	system/cms/language/brazilian/global_lang.php
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of https://github.com/pyrocms/pyrocms into 2.2/develop
FIX: added mime types for ppt and pptx files resolved #3298
Fix Files module issue that causes the wrong items to be shown

When a user selects a different folder while the current folder’s contents are in the process of being displayed (one at a time), the items that have not yet been displayed will appear in the newly selected folder. This resolves that issue.
[Migration] Fixes #3193: Lang keys were not changed in DB
Somebody changed them in the language files and didn't change them in the DB, so fields started showing lang keys instead of human versions.
Merge branch '2.2/master' of git://github.com/pyrocms/pyrocms into 2.2/develop
Require optional dependency for mcrypt, made hard dependency
This removes the fallback to xor_encode which was found to be weak and shitty.
Added security@pyrocms.com note
Updated release information for 2.2.5.
Merge branch 'release/2.2.5' into 2.2/develop
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop