LBSD-140 setTimeout - Angular conflict
Merge pull request #864 from vladnicoara/angular

LBSD-140 setTimeout - Angular conflict