Implement clipping layers
Merge branch 'clippingLayer'
Clean up masks
Merge branch 'clippingLayer'