add/remove layers
Merge branch 'Matias' into Harald