Replacing undocumented ADMIN_URL setting
Merge pull request #220 from rbas/master

Specify  version for django-bootstrap-form
Custom User model changes.
Allow Templated Subjects.
Continuation
Merge pull request #222 from issackelly/master

Custom User model changes.Also closes #221. Thanks!
Update settings.rst (discontinued settings)

See #200
Update settings.rst: sorted discontinued settings
Update settings.rst: fix formatting
fix setting import (fixes CI error)
Merge pull request #226 from brente/docfix

Docs: discontinued settings + formatting fix
Merge pull request #227 from brente/master

fix setting import (fixes CI error)
use django.utils.dates.MONTHS_3 for short month names (resolves #225)
use naturaltime for elapsed times (resolves #229)
exclude KB from navigation if HELPDESK_KB_ENABLED is False (fixes #223)
replace row_tablehead with caption
templates: removed row_odd, row_even, row_hover classes and hover.js
use for ... empty in templates
missed for ... empty opportunity
Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url

Conflicts:
	helpdesk/urls.py