Made sync work with categories in path
Merge branch 'master' into testing