Test Manager DONE
Merge branch 'Atlas_3' into Master_2
ok
Merge branch 'Atlas_3' into Master_2