Commit from Mozilla Verbatim by user ouesten.: 3015 of 3015 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
accept empty update types for ADI (bug 1014752)
Merge pull request #240 from magopian/adi-accept-empty-updatetypes

accept empty update types for ADI (bug 1014752)
Merge branch 'master' of github.com:mozilla/olympia
Commit from Mozilla Verbatim by user a.polivanchuk@outlook.com.: 907 of 3015 strings translated (0 fuzzy).
schematic should also use settings.py (bug 1050155)
Merge pull request #241 from magopian/1050155-fix-schematic-settings

schematic should also use settings.py (bug 1050155)
remove vagrant (bug 1061190)
Merge pull request #242 from magopian/1061190-remove-vagrant

remove vagrant (bug 1061190)
Remove AddonType model (bug 974941)
Merge pull request #243 from yohanboniface/bug-974941-remove-addontypes

Remove AddonType model (bug 974941)
side effects in manage.py are needed by wsgi/zamboni.py (bug 1050155)
Merge pull request #246 from magopian/1050155-manage-py-side-effects

side effects in manage.py are needed by wsgi/zamboni.py (bug 1050155)
don't overload the DJANGO_SETTINGS_MODULE env var if present (bug 1050155)
Bump jingo-minify (bug 1054306)
Removing 'unreviewed submissions' count from editor dashboard (bug 1061313)
Merge pull request #248 from wagnerand/bug-1061313

Removing 'unreviewed submissions' count from editor dashboard (bug 1061313)
Merge pull request #250 from yohanboniface/bug-1054306-bump-jingo-minify

Bump jingo-minify (bug 1054306)
Add create_user and create_superuser method to UserManager (bug 1062214)