Merge branch 'master' of https://github.com/lukeredpath/libPusher

Conflicts:
	libPusher.xcodeproj/project.pbxproj