Update landfill urls
Add --site option to install_landfill
add help text for reviewer comments in submission flow (bug 837809)
make "Localize for: ___" link more obvious on Edit Listing page (bug 991963)
Add validation to ensure that promo feed collections always have a background color.
Merge pull request #2163 from chuckharmston/color_validation

Add validation to ensure that promo feed collections always have a background color.
Merge pull request #2157 from cvan/rev-comm-help

add help text for reviewer comments in submission flow (bug 837809)
rename zamboni url to marketplace and remove one env (bug 1021991)
Merge pull request #2165 from andymckay/999774-three

rename zamboni url to marketplace and remove one env (bug 1021991)
remove note about amo tests
Commit from Mozilla Verbatim by user tonnes.mb@gmail.com.: 2491 of 2491 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user gialloporpora.: 2491 of 2491 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user gialloporpora.: 2491 of 2491 strings translated (0 fuzzy).
Merge branch 'master' of https://github.com/mozilla/zamboni into update-landfill-urls

Conflicts:
	apps/amo/management/commands/install_landfill.py
Script conversion from Serbian Cyrillic to Latin (20140607)
rename feedapp_type to type to match other feed abc's (feed)
collection feed images
Merge pull request #2166 from ngokevin/feedimage

collection feed images
Commit from Mozilla Verbatim by user cesperanc@.: 2019 of 2491 strings translated (0 fuzzy).