Updates to content
Merge branch 'master' of https://github.com/nupmmarkbegale/stepped_care_reboot

Conflicts:
	spec/fixtures/content_providers.yml
Added content providers