Conflicts:
	pom.xml
	src/main/java/org/orekit/errors/OrekitMessages.java
	src/main/java/org/orekit/estimation/leastsquares/Model.java
	src/main/java/org/orekit/estimation/sequential/Model.java
	src/main/java/org/orekit/models/earth/DiscreteTroposphericModel.java
	src/main/java/org/orekit/models/earth/EstimatedTroposphericModel.java
	src/main/java/org/orekit/models/earth/GlobalMappingFunctionModel.java
	src/main/java/org/orekit/models/earth/MappingFunction.java
	src/main/java/org/orekit/models/earth/MariniMurrayModel.java
	src/main/java/org/orekit/models/earth/MendesPavlisModel.java
	src/main/java/org/orekit/models/earth/TroposphericModel.java
	src/main/java/org/orekit/models/earth/ViennaOneModel.java
	src/main/resources/assets/org/orekit/localization/OrekitMessages_da.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_de.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_el.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_en.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_es.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_fr.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_gl.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_it.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_no.utf8
	src/main/resources/assets/org/orekit/localization/OrekitMessages_ro.utf8
	src/test/java/org/orekit/errors/OrekitMessagesTest.java
	src/test/java/org/orekit/estimation/leastsquares/ModelTest.java
	src/test/java/org/orekit/estimation/sequential/ModelTest.java
	src/test/java/org/orekit/models/earth/EstimatedTroposphericModelTest.java
	src/test/java/org/orekit/models/earth/GlobalMappingFunctionModelTest.java
	src/test/java/org/orekit/models/earth/MendesPavlisModelTest.java
	src/test/java/org/orekit/models/earth/ViennaOneModelTest.java