Complete pt-PT localization of Marketplace (zamboni js);
Partial pt-PT localization of Marketplace (zamboni);
Partial pt-PT localization of Marketplace (zamboni);
add URL to serve minifest for yogafire / true packaged app (bug 897156, bug 998819)
split Makefile's targets for ease of use
Merge pull request #1966 from magopian/split-makefile-targets

split Makefile's targets for ease of use
dump apps and collections with export_data (bug 996665)
Merge pull request #1957 from mstriemer/dump-categories-996665

add collections to our API dumps (bug 996665)
Handle special tarako categories in search (bug 998814)

Ground work for bug 987880 (only the parts relevant to search) is
also included to make things easier,
scripts: add landfill reset sql
execute export_data command as a celery task
Merge pull request #1968 from oremj/add-landfill-reset-sql

scripts: add landfill reset sql
fix failing test from export_data change
Merge pull request #1967 from diox/search-api-tarako-categories

Handle special tarako categories in search (bug 998814)
Merge pull request #1963 from cesperanc/master

pt-PT localization
add categories to .po files.  Thanks Mathieu!
skip cache on content ratings api to catch pingback
tweak landfill reset sql
Removed settings.MARKETPLACE (bug 998519)
include pk and filepath in the collection export (bug 999598)
flip from zippy to boku