partial timer work before moving view files
Merge branch 'master' of https://github.com/MFoster/breeze