Updated MarketScreen and UniverseScreen
Merge origin/Sydni into Sydni
merged commit