Add "Author Name" to collections (bug 903168)
Merge pull request #997 from diox/collection-author

Add "Author Name" to collections (bug 903168)
Fix rocketfuel docs
Add collection filter parameters to the API docs
Fix collections tests by testing the FK to Category differently & separately
Fix typo in collections docs
Add a test to make sure we can set NULL values for Collections (bug 894645)
Merge pull request #1001 from diox/collections-remove-region

Add a test to make sure we can set NULL values for Collections (bug 894645)
back out theme stats cron, celery being filled up
have "Queue" link to actual queue instead of "#"
make the MOTD design less horrifying
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