~ fixed a bug where the saturation filter would still affect the collor changes even after it was 'finished'
Merge branch 'master' into fix