Update compatibility with SDWebImageCompletionBlock 1.2 (and SDWebImage 3.7.x)

It would be good to make both libraries optional.

Tested over updated demo as well (#5).
Update UIActivityIndicator-for-SDWebImage
Fix merge