Merge branch 'release/2.2.0-rc1' into 2.2/master
Brazilian Portuguese adds and corrections

Added some Brazilian Portuguese missing strings and corrected some
others.
Some terms used in PyroCMS (as streams, widgets, slug) were left in
English.
fix error in admin navigation controller when trying to flush buffer when there was no buffer
String language corrected to context.
Fixes "Trying to get property of non-object" when trying to lookup a module somewhere in the code when the module isn't installed/found in the database
File was ANSI encoded. Now it's UTF-8 without BOM.

The file was using the wrong encoding, causing strange characters to
show.
Reverting back changes to 2 files

Despite having minimal changes, these files are displaying a full-file
diff. Their changes were reverted back while we try to discover what
happened.
Revert bach change to 1 file

system/cms/modules/maintenance/details.php is marked as an all diff too.
Reverted it back to before the changes.
Fixed an string error
Merge pull request #2918 from RodrigoBalest/2.2/develop

Brazilian Portuguese strings additions and corrections
Query string stream sorting correction

The query string sorting expained at the streams->cp->entries_table()
were not working. The direction was always ASC. This fix corrects it.
Update row_m.php

Fixed. Can't insert 0 to integer type stream field.
Merge pull request #2957 from bsh/patch-12

Whoopsies - this goes in - nice catch!
fixed automatically determine and set the PYRO_ENV variable
fixed automatically determine and set the PYRO_ENV variable

	modified:   .htaccess
Merge branch '2.2/develop' of github.com:kdeng/pyrocms into 2.2/develop

Conflicts:
	.htaccess
Merge pull request #2938 from RodrigoBalest/2.2/develop

Query string stream sorting correction
Merge pull request #2925 from SnakeSVx/2.2/develop

Fixes "Trying to get property of non-object" when trying to lookup a mod...
Closes #2846: Config class does not overload the core Config class
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop