Merge remote-tracking branch 'origin/tab_registry' into make_view_edit_view_into_tab

django/website/tabbed_page/admin.py

...website/tabbed_page/migrations/0002_auto_20150805_1521.py

django/website/tabbed_page/models.py

django/website/tabbed_page/tab_pool.py

django/website/tabbed_page/tests/factories.py

django/website/tabbed_page/tests/registration_tests.py

django/website/tabbed_page/tests/view_tests.py

django/website/tabbed_page/views.py