allow multiple payment providers ensure API doesn't break
Merge pull request #1913 from andymckay/multiple

allow multiple payment providers, ensure API doesn't break
stop mis-configuration and ensure its set on -dev
fix up test
Merge pull request #1917 from andymckay/fixup

stop mis-configuration and ensure its set on -dev
hook up login + logout with commonplace via shared token (bug 970598)
Merge pull request #1763 from ngokevin/secrettoken

hook up login + logout with commonplace via shared token (bug 970598)
Commit from Mozilla Verbatim by user yfdyh000.: 4920 of 4920 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user yfdyh000.: 4920 of 4920 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user besnik@programeshqip.org.: 3297 of 3355 strings translated (2 fuzzy).
Add API Endpoint to Update App Icons (Bug 883271)
Merge pull request #1910 from nearlyfreeapps/bug-883271

Add API Endpoint to Update App Icons (Bug 883271)
Implement fireplace-specific collection API endpoint (bug 989331)
Merge pull request #1919 from diox/collections-fireplace-endpoint

Implement fireplace-specific collection API endpoint (bug 989331)
Fix tests broken in f780902e
Fix tests around ES suggest API
Fixed test for reviewers default action moderation queue
Fixed reviewer test after mobile/desktop changes
fix logout api test