Fixed basestring and pop() in models.py

Merged Olegs NIKISINS requested to merge small_fix into master

Merge request reports