Updated Alerts;  Updated shop screen
Merge branch 'staging'