+coredata
Merge branch 'origin/master'

Conflicts:
	SecondWind.xcodeproj/project.pbxproj
Merge branch 'origin/master'