changed default attribute set - moving and webcam are mostly redundant with cache types
Merge branch 'master' into next