New URLs for legal & privacy links (bug 1005598)
Split addons/themes generators to their own app (bug 1089548)
Merge branch 'master' of github.com:mozilla/olympia into 1089548-split-landfill-app

Conflicts:
	apps/amo/management/commands/install_landfill.py
Merge pull request #348 from davidbgk/1005598-change-mozilla-urls

New URLs for legal & privacy links (bug 1005598)
Commit from Mozilla Verbatim by user amir.farsi.: 332 of 2994 strings translated (53 fuzzy).
Commit from Mozilla Verbatim by user amir.farsi.: 359 of 2994 strings translated (62 fuzzy).
Fixing the inheritance in nomination time across new versions (bug 717495)
Merge pull request #345 from davidbgk/1089548-split-landfill-app

Split addons/themes generators to their own app (bug 1089548)
Delete the preview file no matter what happened (bug 1051854)
Merge pull request #354 from davidbgk/717495-pending-queues-reset

Fixing the inheritance in nomination time across new versions (bug 717495)
Merge pull request #355 from davidbgk/1051854-finally-unlink-previews

Delete the preview file no matter what happened (bug 1051854)
some more code cleanup following the guillotine (bug 1073432)
Fix inconsistencies in the installation docs thanks to @vinyll
Fix the XSS related to collections creation (bug 1092523)
Merge pull request #11 from mozilla/1092523-xss-collection-choices

Fix the XSS related to collections creation (bug 1092523)
Fix the XSS related to themes reviewers (bug 1094361)
Merge pull request #12 from mozilla/1094361-xss-themes-review-queue

Fix the XSS related to themes reviewers (bug 1094361)
Fixing the travis build (useless import)
Merge pull request #356 from davidbgk/install-review-with-vinyll

Fix inconsistencies in the installation docs thanks to @vinyll
Merge pull request #299 from magopian/1073432-remove-webapps-from-code

[DO NOT MERGE] some more code cleanup following the guillotine (bug 1073432)