Merge branch 'master' of https://github.com/mattbittencourt/MI3W

Conflicts:
	Brazilian-Portuguese/main/Mms.apk/res/values-pt-rBR/strings.xml
	Brazilian-Portuguese/main/Settings.apk/res/values-pt-rBR/strings.xml