add procedural generation
Creation cartouche test
Merge branch 'master' into generator
Merge remote branch 'origin/master' into generator
Generator is working
Generator & Signalisation implemented
Merge remote branch 'origin/primitives' into generator

Conflicts:
	museum.py
	museum.xml
new paintings
Merge branch 'generator' into primitives
merging between generator and primitive branch