Merge branch 'master' of sissource.ethz.ch:sis/openbis

microservice-server/conf/config.json

...-server/src/main/java/ch/ethz/sis/microservices/.DS_Store

...a/ch/ethz/sis/microservices/api/configuration/Config.java

...hz/sis/microservices/api/configuration/ServiceConfig.java

.../src/main/java/ch/ethz/sis/microservices/server/.DS_Store

.../ethz/sis/microservices/server/json/JSONObjectMapper.java

...icroservices/server/json/jackson/JacksonObjectMapper.java

.../ch/ethz/sis/microservices/server/logging/LogFactory.java

...z/sis/microservices/server/logging/LogFactoryFactory.java

.../ch/ethz/sis/microservices/server/logging/LogManager.java

...java/ch/ethz/sis/microservices/server/logging/Logger.java

.../microservices/server/logging/log4j/Log4J2LogFactory.java

...z/sis/microservices/server/logging/log4j/Log4JLogger.java

...va/ch/ethz/sis/microservices/server/services/Service.java

...ces/server/services/store/AbstractFileServiceHandler.java

.../microservices/server/services/store/DownloadHandler.java

.../microservices/server/services/store/FileInfoHandler.java

.../ch/ethz/sis/microservices/server/startup/HttpClient.java

...n/java/ch/ethz/sis/microservices/server/startup/Main.java

...ethz/sis/microservices/server/startup/ServerLauncher.java