updated core data with location data
Merge branch 'master' into newData

Conflicts:
	Greatist Message Publisher/Greatist Message Publisher.xcodeproj/project.pbxproj
fixed nasty bug from merge