imported patch patch.diff
Merged in jsmith01/xnat_builder_1_6devresources (pull request #73)

XNAT-2952 Fixed moving of Freesurfer resources so they no longer block moving of assessors.