g
Merge branch 'master' of https://github.com/ecusson/ArtishowFixtures

Conflicts:
	artishowFixture.userprefs
Merge branch 'master' of https://github.com/ecusson/ArtishowFixtures