remove stafftype subclasses
refactoring StaffType
update mtest
update mtest
Make zoom() code a little nicer
Merge branch 'pixelScrolling' of https://github.com/akdor1154/MuseScore into pixelScrolling

Conflicts:
	mscore/scoreview.cpp