merged gallery into django-testserver