Merge branch 'trader'

core/assets/shipsys/weapon/s_weapons_overlay.png

core/assets/shipsys/weapon/smallbox.png

core/assets/shipsys/weapon/weaponsgreen.png

core/assets/shipsys/weapon/weaponsorange.png

core/assets/shipsys/weapon/weaponsred.png

core/assets/shop/storeback.png

core/assets/startgame.png

core/assets/top_ship_on.png

core/assets/yes.png

...er/galaxytruckerreloaded/Controller/TraderController.java

core/src/com/galaxytrucker/galaxytruckerreloaded/Main.java

...galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java

...galaxytrucker/galaxytruckerreloaded/Model/Map/Trader.java

...xytrucker/galaxytruckerreloaded/Server/RequestObject.java

...laxytrucker/galaxytruckerreloaded/Server/RequestType.java

...laxytruckerreloaded/Server/ServerServiceCommunicator.java

.../galaxytruckerreloaded/Server/Services/TraderService.java

...ruckerreloaded/Test/Server/Persistence/TraderDAOTest.java

...ytrucker/galaxytruckerreloaded/View/Buttons/ImButton.java

...erreloaded/View/Buttons/InGameButtons/AutofireButton.java