Merge branch '17-new-input-format' into 'master'

.gitignore

Makefile

core/admin.py

core/fixtures/testdata-core.json

core/migrations/0001_initial.py

core/migrations/0002_auto_20170412_1447.py

core/migrations/0005_auto_20170413_0124.py

core/migrations/0007_auto_20170522_1827.py

core/migrations/0008_auto_20170522_1834.py

core/migrations/0009_auto_20170710_1308.py

core/migrations/0010_auto_20170710_1604.py

core/migrations/0011_auto_20170710_1610.py

core/migrations/0012_auto_20170711_1104.py

core/migrations/0013_auto_20170712_1643.py

core/migrations/0014_auto_20170712_1704.py

core/models.py

core/serializers.py

core/static/css/custom.css

core/templates/core/component/tests_editor.html

core/templates/core/feedback_form.html