sync tree in library + fixed filters
Merge branch 'master' into ice-cream-sandwich