Add Django 1.6b4 compatibility for inline templates
by using needs_explicit_pk_field if the older
has_auto_field method is missing.
Use single if condition for has_auto_field and needs_explicit_pk_field
Merge pull request #157 from nliberg/develop

Fix inline template Django 1.6b4 compatibility issue