fix room generation order
Merge branch 'master' into primitives
Generator & Signalisation implemented
Merge remote branch 'origin/primitives' into generator

Conflicts:
	museum.py
	museum.xml