Merge of master to dev, before release/2.2

[noisy]

• What kind of change does this PR introduce?

To avoid changing a history of master branch, before releasing a new version of eosfactory from dev branch, master branch is merged with strategy -X ours (to allow next smooth merge of dev branch to master)

• What is the current behavior? (You can also link to an open issue here)

Behavior does not change

• What is the new behavior (if this is a feature change)?

Behavior does not change

• Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Noe

• Other information:

made with:

git fetch --all
git checkout dev
git reset --hard origin/dev
git merge origin/master -X ours`