Updated Alerts; Modified Services page; Changed display cat for Flip Flops
Merge branch 'staging'