Ignore .tox. Some tox expansion doesn't work as expected
Merge branch 'develop' into tox

Conflicts:
	.gitignore
	tox.ini