Make collection ordering start at 0 instead of 1
New German strings for Marketplace
encrypt the oauth token (bug 848868)
Update AES_KEYS to use private_mkt.AES_KEYS instead.
move mkt > base
Merge pull request #1004 from andymckay/fix-aes-keys

move mkt > base
Cleaned up zadmin which no longer does reindexing.
Updated docs about Elasticsearch commands.
Cleaned out apps indexing from reindex management command (bug 868088)

If run, this caused the apps index to be overwritten with incorrect
mappings and data.
set created if missing (bug 848868)
add in missing file
Remove EMAIL_BACKEND from stage/settings_addons.py.
str > unicode
Merge pull request #998 from koehlermichael/master

New German strings for Marketplace
Fixed a few locale strings causing errors
Fixed another locale string causing errors
Add RestSharedSecretAuthentication to CollectionViewSet (bug 904208)
Merge pull request #1006 from chuckharmston/904208-api_collections_ssa

Add RestSharedSecretAuthentication to CollectionViewSet (bug 904208)
remove price for the moment (bug 905113)
Merge pull request #1007 from andymckay/905113

remove price for the moment (bug 905113)