[#586] Update ModelForm fields for Django 1.6
Merge pull request #590 from akvo/feature/du586_modelforms_fields

[#586] Update ModelForm fields for Django 1.6