new queries for the ADI script (bug 1014752)
Merge pull request #148 from magopian/1014752-adi-export-script-new-queries

[WIP] New queries for the ADI script (bug 1014752)
Commit from Mozilla Verbatim by user a.polivanchuk@outlook.com.: 453 of 3286 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Remove mkt settings from local_settings template (bug 1036997)
Merge pull request #150 from davidbgk/1036997-remove-mkt-settings

Remove mkt settings from local_settings template (bug 1036997)
Merge branch 'master' of github.com:mozilla/olympia
Commit from Mozilla Verbatim by user amanpreet.alam@gmail.com.: 261 of 3286 strings translated (0 fuzzy).
move name/creator/homepageURL/updateURL to attributes (bug 1006794)
less logs and moved folder for adi script (bug 1014752)
Merge pull request #151 from magopian/1006794-tag-to-attr

move name/creator/homepageURL/updateURL to attributes (bug 1006794)
Merge pull request #152 from magopian/1014752-adi-export-script-yet-again

less logs and moved folder for adi script (bug 1014752)
filter addons: only extensions, no empty guid (bug 1014752)
Merge pull request #153 from magopian/1014752-adi-export-script-last-chance-maybe

filter addons: only extensions, no empty guid (bug 1014752)