Changes made by Icenium QA (iceniumqa@gmail.com).
Merge branch 'master' of https://github.com/IceniumQA/Conflict_Test.git