clean up and reorganization
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/msml/exporter/sofanew.py
	src/msml/model/alphabet.py
preprocessing for resolving references in scenes