Added Faction selector integrated with the Star System Model model. Still need to implement jump gate system. 
Added Economy Manager, Trader, and trade class to implement simple trading. Needs more work if anyone wants to take it on feel free. 

Changed some of the arraylist instances to hashmap when it makes sense to do so. Any instance of hashmap is due to this.
Merge
changed the package hierarchy to include a root directory. For example, model.StarSystem has been renamed to spacetrader.model.StarSystem
Merge branch 'master' of https://github.com/fmsanchez/SpaceTrader

Conflicts:
	.nb-gradle/private/cache/SpaceTrader-d41d8cd98f00b204e9800998ecf8427e
Universe.java is deprecated; its replacement is spacetrader.model.Galaxy.
Stuff
Merge
Models for M5: Marketplace trading
M5 model
Merge branch 'master' of https://github.com/fmsanchez/SpaceTrader

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/outputFileStates.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
deleted unnecessary stuff
More stuff for M5
Merge branch 'master' of https://github.com/fmsanchez/SpaceTrader
Obtain model files for M5
Models for M5
junk