removed duplicate copy of function "ResourceForm"
Merge remote-tracking branch 'origin/Refactoring' into Refactoring