Merge branch 'release/2.6'
Merge branch 'release/3.0'
Try to import update_wrapper from functools first
Merge branch 'master' of https://github.com/anrie/django-tablib into feature/django-16-functools

Conflicts:
	django_tablib/admin/__init__.py
Merge branch 'feature/django-16-functools' into develop
Upped version number.
Merge branch 'release/3.0.1' into develop