Merge remote branch 'pmac/enable-database' into demo3

Conflicts:
	bedrock/newsletter/tests/test_views.py
Merge branch 'bug-870998-firefoxos-type' into demo3