Fixed an 404 error when stop nagging is called
Merge branch 'refs/heads/localDev'