Merging master into buildings.

Some resource skeletons are removed, and resources are changed with unit is built. Making sure, this build works with changes on master.