merge django-twoscoops-project