1
Merge branch 'master' of https://github.com/callzhang/Shareability

Conflicts:

Shareability.xcodeproj/xcuserdata/lee.xcuserdatad/xcdebugger/Breakpoints
_v2.xcbkptlist
	Shareability/Images.xcassets/AppIcon.appiconset/Contents.json
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-60@2x-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-72.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-76.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
	Wechat/ShareViewController.m
Merge branch 'master' of https://github.com/callzhang/Shareability

Conflicts:

Shareability.xcodeproj/xcuserdata/lee.xcuserdatad/xcdebugger/Breakpoints
_v2.xcbkptlist
	Shareability/Images.xcassets/AppIcon.appiconset/Contents.json
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-60@2x-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-72.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-76.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon.png
	Shareability/Images.xcassets/AppIcon.appiconset/Icon@2x.png
	Shareability/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
	Wechat/ShareViewController.m