Merge branch 'master' into network

core/assets/shipsys/weapon/desktop.ini

core/assets/shipsys/weapon/generalbox.png

core/assets/shipsys/weapon/laser.png

core/assets/shipsys/weapon/minibox.png

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/Crew/Crew.java

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

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

...xytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java

...xytrucker/galaxytruckerreloaded/Server/ClientHandler.java