check for str OR unicode
restore readonly_fields on admin form
Merge branch 'master' into django1.7_compat