update

update
Merge branch 'event' of https://github.com/heapstack/ios into event

Conflicts:
	HS.xcodeproj/project.pbxproj