+ Resources etc. for Buildings/Units
Merge remote-tracking branch 'origin/master'