correct heat ordering

  -fix file ordering
  -fix resource ordering
  -Bug #1250776 https://bugs.launchpad.net/fuel/+bug/1250776
Merge pull request #869 from Zipfer/heat

correct heat ordering