initial TriggerVersionField implementation
Merge branch 'develop' into feature/triggers

Conflicts:
	README.rst
	concurrency/tests/__init__.py
	concurrency/tests/models.py
	docs/index.rst
start mysql.db.backend
fixed small typo in conflict handler view
removes SANITY_CHECK and force nowait=True in select_for_update
simplfied concurrent updates handling.

Now CONCURRENCY_CALLBACK is always invoked, the default implementation raises RecordModifiedError
ops... restored NOWAIT for mysql
initial TriggerVersionField implementation
start mysql.db.backend
work in progress
Merge branch 'develop' into feature/triggers

* develop:
  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
  ops... restored NOWAIT for mysql
  simplfied concurrent updates handling.
  removes SANITY_CHECK and force nowait=True in select_for_update
  fixed small typo in conflict handler view

Conflicts:
	Makefile
	concurrency/config.py
	concurrency/core.py
	concurrency/fields.py
	concurrency/tests/__init__.py
	concurrency/tests/models.py
	concurrency/tests/test_admin_edit.py
	concurrency/tests/test_api.py
	concurrency/views.py
	conftest.py
	demo/demoproject/settings.py
	docs/index.rst
	docs/settings.rst
	tests/test_forms.py
	tox.ini
TriggerVersionField implementation

works for mysql, postgres,sqlite3
updates Makefile
let python3.2 work
updates travis config
TriggerVersionField version auto increase

increase version number if not reload
add py==1.4.19 to requirements. trying to fix travis issue
Merge branch 'feature/triggers' into develop

* feature/triggers:
  add py==1.4.19 to requirements. trying to fix travis issue
  TriggerVersionField version auto increase
  updates travis config
  let python3.2 work
  updates Makefile
  TriggerVersionField implementation
  work in progress
  start mysql.db.backend
  initial TriggerVersionField implementation
  ops... restored NOWAIT for mysql
  simplfied concurrent updates handling.
  removes SANITY_CHECK and force nowait=True in select_for_update
  fixed small typo in conflict handler view
  start mysql.db.backend
  initial TriggerVersionField implementation