stopped the timer after view leaves
Merge branch 'stayFrosty' into Developer-Branch