# Conflicts:
#	Client/src/main/java/org/shortcircuit/unconquered/client/controllers/GameController.java

# Conflicts:
#	Client/src/main/java/org/shortcircuit/unconquered/client/controllers/GameController.java

- Updated Trade View with new GUI and added functionality for eventual sending of trades to server
- Centered TopInventoryView

- Deleted Battle, Barracks, and Map views
- Corrected view labels in GameController

Added TopInventoryView
Added QueueView (skeleton)
Added PlayerUpdateRunnable
Added the screen to be refreshed and queried every 1 minute.

GameController:
+ Added buyBuilding stub

BuildingsView:
+ Added purchaseBuilding button

+ Added getBuildingsBox()
+ Added buy_building() stub
+ Prettified BuildingView

+ Created buildScreen method instead of having everything in constructor.
+ Added getPlayer() in GameController
+ Fixed up the InventoryView

- Added the CSS to BuildingsView and TradeView