work in progress
work in progress
protocol2 stable, 53% coverage
add new protocol for django 1.6.

the new protocol fully implements 'optimistick lock' without locking the record.
The old protocol (using select_for_update) is stille used for django < 1.6
fixes tests.settings database name
changed default value
updates django versions (Makefile/tox.ini)
updates test to pass mysql
improved tests
updates docs
updated CHANGES and README
test configuration
fixes demoproject
fixes demoproject
let the tests pass
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
Merge branch 'feature/protocol2' into develop

* feature/protocol2:
  let the tests pass
  let the tests pass
  fixes demoproject
  fixes demoproject
  test configuration
  updated CHANGES and README
  updates docs
  improved tests
  updates test to pass mysql
  updates django versions (Makefile/tox.ini)
  changed default value
  fixes tests.settings database name
  add new protocol for django 1.6.
  protocol2 stable, 53% coverage
  work in progress
  work in progress