fix contenttypes.generic warning in django 1.7
Merge pull request #216 from collinanderson/develop

fix contenttypes.generic warning in django 1.7