removed angular-underscore
resolved timer issue.
Merge remote-tracking branch 'origin/master'