let the tests pass
Merge branch 'feature/protocol2' of github.com:saxix/django-concurrency into feature/protocol2

* 'feature/protocol2' of github.com:saxix/django-concurrency:
  let the tests pass

Conflicts:
	Makefile