changed notification from didbecomeactive to willenterforeground
Merge remote-tracking branch 'origin/Kasey_Cleanup' into Kasey_Cleanup