adding resource name next to file upload button in resource view/edit form
Merge remote-tracking branch 'origin/Refactoring' into Refactoring