admin search
Merge branch 'master' of https://github.com/gregplaysguitar/django-trolley