Templates tags expecting objects can now accept a tuple (content_type_pk, object_pk)
Merge branch 'master' of https://bitbucket.org/reymor/django-content-interactions

Conflicts:
	content_interactions/templatetags/content_interaction_tags.py