Merge commit '904e81af928eac52787e082b9d4ba6ab7de231e7'

Conflicts:
	WSProgress/FBShimmering-Prefix.pch
	WSProgress/FBShimmering.h
	WSProgress/FBShimmeringLayer.h
	WSProgress/FBShimmeringLayer.m
	WSProgress/FBShimmeringView.h
	WSProgress/FBShimmeringView.m
	WSProgress/MMMaterialDesignSpinner.h
	WSProgress/MMMaterialDesignSpinner.m
	WSProgress/WSIndefiniteAnimationView.h
	WSProgress/WSIndefiniteAnimationView.m
	WSProgress/WSProgressBundle.bundle/angle-mask@3x.png
	WSProgress/WSProgressBundle.bundle/error@2x.png
	WSProgress/WSProgressBundle.bundle/success@2x.png
	WSProgressHUD.xcodeproj/project.pbxproj
	WSProgressHUD/FBShimmering-Prefix.pch
	WSProgressHUD/FBShimmering.h
	WSProgressHUD/FBShimmeringLayer.h
	WSProgressHUD/FBShimmeringLayer.m
	WSProgressHUD/FBShimmeringView.h
	WSProgressHUD/FBShimmeringView.m
	WSProgressHUD/MMMaterialDesignSpinner.h
	WSProgressHUD/MMMaterialDesignSpinner.m
	WSProgressHUD/Source/FBShimmering/FBShimmering-Prefix.pch
	WSProgressHUD/Source/FBShimmering/FBShimmering.h
	WSProgressHUD/Source/FBShimmering/FBShimmeringLayer.h
	WSProgressHUD/Source/FBShimmering/FBShimmeringLayer.m
	WSProgressHUD/Source/FBShimmering/FBShimmeringView.h
	WSProgressHUD/Source/FBShimmering/FBShimmeringView.m
	WSProgressHUD/Source/MMMaterialDesignSpinner/MMMaterialDesignSpinner.h
	WSProgressHUD/Source/MMMaterialDesignSpinner/MMMaterialDesignSpinner.m
	WSProgressHUD/Source/WSIndefiniteAnimationView.h
	WSProgressHUD/Source/WSIndefiniteAnimationView.m
	WSProgressHUD/Source/WSProgressBundle.bundle/angle-mask@3x.png
	WSProgressHUD/Source/WSProgressBundle.bundle/error@2x.png
	WSProgressHUD/Source/WSProgressBundle.bundle/success@2x.png
	WSProgressHUD/WSIndefiniteAnimationView.h
	WSProgressHUD/WSIndefiniteAnimationView.m
	WSProgressHUD/WSProgressBundle.bundle/angle-mask@3x.png
	WSProgressHUD/WSProgressBundle.bundle/error@2x.png
	WSProgressHUD/WSProgressBundle.bundle/success@2x.png

Author: devSC