added resourceFileCRUD unit test and fixes
Merge remote-tracking branch 'remotes/origin/master' into shaun
fix in keyword assignment
Merge remote-tracking branch 'remotes/origin/shaun'
Merge branch 'shaun'
Merge remote-tracking branch 'origin/master'