Merge branch 'PetrDlouhy-master' into issue_fix

# Conflicts:
#	smart_selects/form_fields.py

smart_selects/form_fields.py

@@ -1,7 +1,10 @@
-from django.db.models import get_model
+try:
+    from django.apps import apps
+    get_model = apps.get_model
+except ImportError:
+    from django.db.models.loading import get_model
 from django.forms.models import ModelChoiceField, ModelMultipleChoiceField
 from django.forms import ChoiceField
-
 from smart_selects.widgets import ChainedSelect, ChainedSelectMultiple
 from django.utils.encoding import force_text
 import traceback