Change choices field and conflict resolved
Merge branch 'master' of github.com:OpenSourceSag/django-dash2013