Merge pull request #149 from vladnicoara/master

LB-1964 Angularjs session management
LBSD-140 setTimeout - Angular conflict