Remove UIAlertView+Blocks
Replace deprecated UIAlertView with UIAlertController
Merge branch 'alert'