Merge branch 'master' into userdb

Conflicts:
	mygpo/admin/tests.py
	mygpo/api/advanced/__init__.py
	mygpo/api/backend.py
	mygpo/api/simple.py
	mygpo/core/models.py
	mygpo/core/tasks.py
	mygpo/db/couchdb/__init__.py
	mygpo/db/couchdb/episode_state.py
	mygpo/db/couchdb/management/commands/dump-sample.py
	mygpo/db/couchdb/management/commands/sync-design-docs.py
	mygpo/db/couchdb/podcast.py
	mygpo/db/couchdb/podcast_state.py
	mygpo/db/couchdb/user.py
	mygpo/maintenance/management/commands/merge-episode-states.py
	mygpo/maintenance/tests.py
	mygpo/settings.py
	mygpo/web/views/device.py
	mygpo/web/views/settings.py
Merge branch 'master' into tmp