Merge branch 'master' into network

...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

...erreloaded/View/Buttons/InGameButtons/ContinueButton.java

...reloaded/View/Buttons/InGameButtons/CreateGameButton.java

...eloaded/View/Buttons/InGameButtons/CrewDismissButton.java

...rreloaded/View/Buttons/InGameButtons/EventPageButton.java

...aded/View/Buttons/InGameButtons/InventoryCloseButton.java

...erreloaded/View/Buttons/InGameButtons/MainMenuButton.java

...truckerreloaded/View/Buttons/InGameButtons/MapButton.java

...ruckerreloaded/View/Buttons/InGameButtons/MoveButton.java

...ckerreloaded/View/Buttons/InGameButtons/OptionButton.java

...uttons/InGameButtons/OptionButtons/Audio/AudioButton.java

...Buttons/InGameButtons/OptionButtons/Audio/BackButton.java

...ttons/InGameButtons/OptionButtons/Control/BackButton.java

...ns/InGameButtons/OptionButtons/Control/ControlButton.java