merge
Merge commit '3eba959a6962e3bddf797fa0a0032c9f19f4315d' into newsstand_notification

Conflicts:
	Baker.xcodeproj/project.pbxproj
	Baker/BakerAssets.xcassets/AppIcon.appiconset/Contents.json
	Baker/BakerAssets.xcassets/newsstand-app-icon.imageset/Contents.json