Added toast-like alerts, replaced usual ones
Merge remote-tracking branch 'origin/master'