v0.4.2 rc2
Merge branch 'master' of github.com:wooster/apptentive-ios
Merge branch 'master' of github.com:wooster/apptentive-ios

Conflicts:
	ApptentiveConnect/resources/localization/English.lproj/Localizable.strings
	FeedbackDemo/FeedbackDemo.xcodeproj/project.pbxproj
	FeedbackDemo/FeedbackDemo/FeedbackDemo-Info.plist
Merge branch 'master' of github.com:wooster/apptentive-ios

Conflicts:
	FeedbackDemo/FeedbackDemo.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:wooster/apptentive-ios

Conflicts:
	ApptentiveConnect/resources/localization/English.lproj/Localizable.strings
Moving StoreKit framework to the right spot.
Merge branch 'master' of github.com:wooster/apptentive-ios