Fixed data model inconsistencies
Merge branch 'master' of https://github.com/Grantismo/after_care

Conflicts:
	AfterCare.xcodeproj/project.pbxproj
	AfterCare/ResourcesViewController.xib
	AfterCare/SafetyPlanViewController.xib