fixes user
Merge branch 'master' of https://github.com/fatrix/django-golive

Conflicts:
	golive/layers/base.py