hashMaps changed to arrays
Merge origin/master
Fix weird planet selection anomaly
set up basic controller

quite messy, still needs to enforce tech level limits
implemented null design pattern in calcMarketPrice() in TradeGood
disabled better weapons based on tech level

and a little code cleanup
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/ShipyardController.java
Fix PMD warnings
Fix a buttload of checkstyle and PMD related things (spacing, unused variables, magic numbers, etc.)
Commit JUnit tests for Universe
Clean up syntax (checkstyle)
Fix checkstyle/PMD things
fixing checkstyle stuff
fixed magic numbers in calcStock() method
added some more finals to solve magic numbers
Fix magic numbers in CharacterCreationController textbox listeners
Merge origin/master
Final checkstyle fixes, also maybe breaking the market
Disable travel events for checkstyle demo
Added my junit tests