#567 Alert Overriden
#567 Fix Editor conflicts
#567 Fixed closing tag
#567 Fix master conflicts
Merge branch 'C4_Mussab_Override_Default_Alert' of https://github.com/alaashafaee/Coolsoft-14 into C4_Mussab_Override_Default_Alert
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into C4_Mussab_Override_Default_Alert
#567 fix master conflict
#567 Fix onload issue
#567 Fix master conflicts
Merge pull request #568 from alaashafaee/C4_Mussab_Override_Default_Alert

Pull Request: C4_Mussab_Override_Default_Alert