Added allow $ in files2copy
Merge branch 'trunk'