re-established the possibility to override/extend userlink and nav-global blocks, see #335
Merge branch 'stable/2.4.x' of github.com:sehmaschine/django-grappelli into stable/2.4.x