use new throbber for splash screen (bug 966051)
remove useless docs
Merge pull request #1813 from andymckay/marketplace-docs

remove useless docs
Add device filtering to featured collections (bug 975063)
Removed extra newline
bump django-mysql-pool again
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 4914 of 4914 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
catch indexerror on migrate activity log
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 4914 of 4914 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user steekid.: 4914 of 4914 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 4914 of 4914 strings translated (0 fuzzy).
triple bump django-mysql-pool
bump django-cache-machine
Commit from Mozilla Verbatim by user markh@babelzilla.org.: 4914 of 4914 strings translated (0 fuzzy).
Try out Django 1.6 connection persistence instead of using mysql_pool.
Try out CONN_MAX_AGE on -dev.
Revert all Django-1.6 upgrade-related changes.

This reverts commits:
26ae083
e4b8df3
9c89419
9e76f14
4995ffc
f78548f
ec85f89
legal doc updates