Conflicts:
	ios-release-notes.md
Updated iOS 2.4 tag after fixing sample app