Fixed in Bank where clicked get loan would throw an exception.
Fixed errors with javadocs in mainController.
Wrote PoliceEncounterTest and fixed bug in cargo and warpscreen controller.
Wrote PoliceEncounterTest and fixed bug in cargo and warpscreen controller.
Have commit annoying property files
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/built-jar.properties
	build/classes/spacetrader/Player.class
	build/classes/spacetrader/commerce/Cargo.class
	build/classes/spacetrader/commerce/PriceIncreaseEvent.class
	build/classes/spacetrader/commerce/Transaction.class
	build/classes/spacetrader/system/MainController.class
	build/classes/spacetrader/system/SpaceMapScreenController$MapPane$MapDragContext.class
	build/classes/spacetrader/system/SpaceMapScreenController$MapPane.class
	dist/SpaceTrader.html
	dist/SpaceTrader.jar
	dist/SpaceTrader.jnlp
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/spacetrader/system/FinanceScreenController.java
	src/spacetrader/system/HomeScreenController.java
	src/spacetrader/system/MainController.java