CompositeStyle made immutable, added Styles and StylesInternal with static methods. SimpleStyle renamed to AdditiveStyle. Covered by unit tests.
Merge remote-tracking branch 'origin/master'