Merge branch 'master' into 'develop'

# Conflicts:
#   ApplicationDatabaseSynchronisation/src/main/java/org/josast/databaseSync/Commande.java
#   ApplicationDatabaseSynchronisation/src/main/java/org/josast/databaseSync/DataToExchange.java
#   ApplicationDatabaseSynchronisation/src/main/java/org/josast/databaseSync/DataToUVSQsatControlCenter.java
#   ApplicationDatabaseSynchronisation/src/main/java/org/josast/databaseSync/GetDataFromAmsatDatabase.java
#   ApplicationDatabaseSynchronisation/src/main/java/org/josast/databaseSync/SendSftp.java
#   ApplicationSerial/src/main/java/org/josast/serialtoTNC/type/TncKissType.java
#   ModuleSIDS/.classpath
#   ModuleSIDS/.project
#   pom.xml