Fixing l10n bug.
Merge branch 'master' of https://github.com/brunovilar/WhoAmI-FirefoxOS into brunovilar-master

Conflicts:
	foxy.html
	locales/english.properties
	locales/locales.ini
	locales/portuguese.properties