Update landfill urls
Add --site option to install_landfill
Merge branch 'master' of https://github.com/mozilla/zamboni into update-landfill-urls

Conflicts:
	apps/amo/management/commands/install_landfill.py
Revert "Add --site option to install_landfill"

This reverts commit 232250ceba5a751408f4b5888103791779a033d4.
Remove references to addons landfill URL
Rename ADDON_ICON_SIZES and only generate the ones we need (bug 885329)

(we should probably deprecate 32x32 and 48x48 as well, but that's
 for another bug)
import cleanup
I guess we were using these for imports
Fix XSS through string interpolation (bug 1023594)
prevent cookie-based authentication for the API (bug 987932)
Merge pull request #2223 from diox/stop-generating-useless-icon-sizes

Rename ADDON_ICON_SIZES and only generate the ones we need (bug 885329)
Stop relying on 512x512 icons in webpay_jwt tests (bug 885329)
Fixed migration to remove rows before deleting the column
add id to simplepreviewserializer for transonic
log_settings: z.geoip log level to WARNING

z.geoip on info logs every geodude lookup.
Bump app-validator
Merge pull request #2227 from oremj/geoip-log-level

log_settings: z.geoip log level to WARNING
Merge pull request #2225 from robhudson/migration-fix

Fixed migration to remove rows before deleting the column
Merge pull request #2226 from ngokevin/master

add id to simplepreviewserializer for transonic
fix preview test