Deactivated concurrent editing since it was causing problems..
Merge branch 'master' of github.com:h3/django-editlive