Use 'Apps:Edit' on marketplace (bug 945699)
allow multiple payment providers ensure API doesn't break
remove git conflicts
Merge pull request #1913 from andymckay/multiple

allow multiple payment providers, ensure API doesn't break
use safer_get_or_create when creating comm_threads (bug 992369)
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)
Don't allow nameless collections in the API (Bug 984934)
Ensure update_manifests celery task is retried (Bug 928462)
Add task to run uploaded icons through Pngcrush (Bug 983426)
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)