Bug 1022767 - Use manifest.webapp instead of locales.ini for l10n metadata. r=pike, yuren, stas
add requested back into the Env's ctor
Bug 1048411 - Remove GAIA_INLINE_LOCALES optimization. r=stas
Merge branch 'master' into newapi

Conflicts:
	lib/l20n/context.js
	lib/l20n/locale.js
	tests/lib/context/fallback_test.js
	tests/lib/context/langnego_test.js
	tests/lib/context/loading_test.js
	tests/lib/context/resources_test.js
	tests/lib/context/retranslation_test.js
Revert "add requested back into the Env's ctor"

This reverts commit 74fb43115520b381bbbcbdfcb17d419db5f97271.
Remove env.request
manifest can be a promise
Merge branch 'newapi' into immutable