staffLines now correctly imported into music21
Merge remote-tracking branch 'upstream/master' into StaffLines

Conflicts:
	music21/converter.py
staffLines export to MusicXML is done
Small change for displaying Layout data.
Merge remote-tracking branch 'upstream/master' into StaffLines
accidently removed subConverter.py
Merge remote-tracking branch 'upstream/master' into StaffLines
Merge remote-tracking branch 'upstream/master' into StaffLines
Merge pull request #60 from metalmike/StaffLines

Staff lines import and export is now working