commit
Merge branch 'master' of github.com:20tab/django-taggit-live

Conflicts:
	taggit_live/forms.py
forms modified