fix error in admin navigation controller when trying to flush buffer when there was no buffer
Updated the Brazilian translation
Added a new configuration key to language.php config file, which makes it possible to disable Accept-language check in pick_language.php hook
Updated config comment section header
Updated config comment section header
Delete language.php.orig

Removed git artifact
Merge branch 'release/2.2.4' into 2.2/develop
Merge pull request #2921 from james2doyle/2.2/fix-nav-ob-end-clean

fix error in admin nav controller when trying to flush buffer when there was none
Merge remote-tracking branch 'upstream/2.2/develop' into accept-language-disable
Merge pull request #3275 from kimse1/accept-language-disable

Added option to turn Accept-language on/off
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
[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.
Updated release information for 2.2.5.
Merge branch 'release/2.2.5' into 2.2/master