Added file alertWindow
Merge branch 'feature-alert-window'