LBSD-140 setTimeout - Angular conflict
Merge pull request #150 from vladnicoara/master

LBSD-140 setTimeout - Angular conflict