Merge pull request #86 from amcgowanca/7.x-1.x-dev

Updated patches within .make files
Added file field presave patch for saving empty files.