Merge branch 'extract-conflict-resolution'

.gitignore

CHANGELOG.md

fixtures/program/category.json

fixtures/program/fundingcategory.json

fixtures/program/host.json

fixtures/program/licensetype.json

fixtures/program/linktype.json

fixtures/program/musicfocus.json

fixtures/program/rrule.json

fixtures/program/show.json

fixtures/program/topic.json

poetry.lock

profile/__init__.py

profile/admin.py

profile/migrations/0001_initial.py

profile/migrations/0002_auto_20171129_1828.py

profile/migrations/0003_auto_20171213_1737.py

profile/migrations/__init__.py

profile/models.py

profile/serializers.py