Changed alert messages
Merge branch 'change-alert-message'