Updated alerts; Updated parse files
Merge branch 'staging'