Merge
Merge branch 'dev' of github.com:shymonk/django-table into dev