Add help text
Add media upload to help text
Refactor media widget
Add help text to tests
Fix multiple choice items and associated tests
Consolidate if statements
Merge branch 'master' into help-text
Merge branch 'master' into help-text
Use base path instead of data
Merge branch 'master' into help-text
Add help text feature flag
Merge branch 'master' into help-text

Conflicts:
	src/parser.js
Merge pull request #260 from dimagi/help-text

Help text