Merge pull request #415 from infoxchange/django-model-update

Django model update
Merge remote-tracking branch 'upstream/master' into integration