fix merge conflicts from master
fix merge conflicts from master

mntan/django-mediasync,mntan/django-mediasync,mntan/django-mediasync,sunlightlabs/django-mediasync,sunlightlabs/django-mediasync,sunlightlabs/django-mediasync