File and directive clean up
refactoring work
refactor work
Refactor work needed

Revert back and pull timerService back into ctrl
Refactor work
Merge remote-tracking branch 'origin/development' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'