Merge branch 'master' into stable

TODO

TODO.md

nop/urls.py

program/admin.py

program/management/commands/addnote.py

program/management/commands/cleanup_defaultshow.py

program/management/commands/createuser.py

program/management/commands/deleteuser.py

program/management/commands/importhosts.py

program/management/commands/importnotes.py

program/management/commands/importprogramslots.py

program/management/commands/importshows.py

program/migrations/0006_note_remove_cba_entry_id.py

program/migrations/0007_show_remove_cba_series_id.py

program/models.py

program/templatetags/content_boxes.py

program/templatetags/timeslots.py

program/urls.py

program/views.py

pv/templates/404.html