merged master into stable after new deployment

.gitignore

locale/DE/LC_MESSAGES/django.mo

locale/DE/LC_MESSAGES/django.po

nop/dbrouter.py

nop/migrations/0001_initial.py

nop/migrations/__init__.py

nop/models.py

nop/urls.py

nop/views.py

program/admin.py

program/forms.py

program/management/__init__.py

program/management/commands/__init__.py

program/management/commands/update_hosts.py

program/management/commands/update_programslots.py

program/management/commands/update_shows.py

program/migrations/0001_initial.py

program/migrations/0002_host_is_always_visible.py

program/migrations/0003_host_is_active.py

program/migrations/0004_show_is_active.py