added update_batch() manager method
resolve conflicts

Conflicts:
	generic_follow/managers.py
Merge branch 'master' of https://github.com/gizmag/django-generic-follow