AlertView
Merge remote-tracking branch 'origin/master'
SP fix, alerts fix
Merge remote-tracking branch 'origin/master'
Conflicts