Add button to reset options.
Merge branch 'compositor' of https://github.com/mbebenita/shumway into compositor
Fix fill rule for clipping regions.
Fix serialization of scaleFactors.