Merge branch 'master' into Dustin
Removed saving alerts, fixed drop down menu issues
Merge branch 'Dustin'
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones