Merge branch 'hotfix/variant_correction'
updating gitignore
Merge branch 'master' of https://github.com/openjaf/art-market

Conflicts:
	.gitignore