refactor(#484): resolve merge conflicts

...rc/main/java/de/fitko/fitconnect/client/SenderClient.java

...a/de/fitko/fitconnect/client/model/AttachmentPayload.java

...in/java/de/fitko/fitconnect/client/model/DataPayload.java

.../de/fitko/fitconnect/client/model/ReceivedSubmission.java

.../de/fitko/fitconnect/client/model/ServiceTypePayload.java

...a/de/fitko/fitconnect/client/model/SubmissionPayload.java

...ct/client/strategies/SendEncryptedSubmissionStrategy.java

...tconnect/client/strategies/SendNewSubmissionStrategy.java

...de/fitko/fitconnect/client/strategies/SubmitStrategy.java

.../java/de/fitko/fitconnect/client/util/SubmissionUtil.java

...va/dev/fitko/fitconnect/client/cmd/CommandLineClient.java

...ct/client/strategies/SendEncryptedSubmissionStrategy.java

...itconnect/client/factory/ApplicationConfigLoaderTest.java