parent folders icon is marked when only one file in folder
Merge remote-tracking branch 'origin/master'