catch attribute error for south datamigrations, revert pk test which breaks subclasses
Merge branch 'hotfix/jsonfield-not-deserialzed-in-inherited-model' into develop