Basic properties changes
Merge https://github.com/huntmiester/GeoBattles
Merge remote-tracking branch 'upstream/dev'
Petey's Commit