Changes made by AssiNET Assi (Assi.Ivomir@gmail.com).
Merge branch 'master' of https://github.com/IceniumQA/Conflict_Test_Graph.git