Merge pull request #21 from Jbtyson/master

merge master into resources
"updated resource management between different gamobjects"
"reconnected gui resource bar to correct game object"
"factions track supply correctly"
MineralMine.js - fixed reneder location and hitbox
Merge pull request #22 from Jbtyson/resources

Merge resources into master