Merge branch 'master' of https://github.com/bianca-salunga/myrp_automation

Conflicts:
test-data/testdata.xls
Merge branch 'master' of https://github.com/bianca-salunga/myrp_automation