fixed build fileset task to include all files and subdirs
Merge remote-tracking branch 'origin/master'