Remove the need for a settings_local.py (bug 1050155)
remove the default app (bug 1050154)
Commit from Mozilla Verbatim by user jaggedzak.: 284 of 3015 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user a.polivanchuk@outlook.com.: 339 of 3015 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Merge branch 'master' of github.com:mozilla/olympia
Commit from Mozilla Verbatim by user jaggedzak.: 679 of 3015 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user yfdyh000.: 3015 of 3015 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user maktrix.: 802 of 3015 strings translated (0 fuzzy).
Merge pull request #205 from magopian/1050154-remove-default-app

Remove the default app (bug 1050154)
Revert "Remove the default app (bug 1050154)"
Merge pull request #218 from mozilla/revert-205-1050154-remove-default-app

Revert "Remove the default app (bug 1050154)"
fix an import loop in services (bug 1055654)
Merge pull request #219 from magopian/fix-services-utils

fix an import loop in services (bug 1055654)
Fix the theme_update service (bug 1055654)
Merge pull request #220 from magopian/1055654-fix-theme_update

Fix the theme_update service (bug 1055654)
Commit from Mozilla Verbatim by user civas.: 2214 of 3015 strings translated (0 fuzzy).